svn commit: r1560560 - /subversion/trunk/build/generator/gen_win_dependencies.py

[br...@apache.org]

Author: breser
Date: Wed Jan 22 23:22:24 2014
New Revision: 1560560

URL: http://svn.apache.org/r1560560
Log:
Followup to r1560558, unbreak builds with installed APR/APR-util builds.

* build/generator/gen_win_dependencies.py
   (GenDependenciesBase._find_apr,
    GenDependenciesBase._find_apr_util_and_expat): Need both tests since the
     debug_dll_dir will be None with binary installs.

Modified:
    subversion/trunk/build/generator/gen_win_dependencies.py

Modified: subversion/trunk/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/trunk/build/generator/gen_win_dependencies.py?rev=1560560&r1=1560559&r2=1560560&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Wed Jan 22 23:22:24 2014
@@ -393,7 +393,7 @@ class GenDependenciesBase(gen_base.Gener
         debug_dll_dir = None
         
     bin_files = os.listdir(dll_dir)
-    if os.path.isdir(debug_dll_dir):
+    if debug_dll_dir and os.path.isdir(debug_dll_dir):
       debug_bin_files = os.listdir(debug_dll_dir)
     else:
       debug_bin_files = bin_files 
@@ -498,7 +498,7 @@ class GenDependenciesBase(gen_base.Gener
         debug_dll_dir = None
 
     bin_files = os.listdir(dll_dir)
-    if os.path.isdir(debug_dll_dir):
+    if debug_dll_dir and os.path.isdir(debug_dll_dir):
       debug_bin_files = os.listdir(debug_dll_dir)
     else:
       debug_bin_files = bin_files