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

[ko...@apache.org]

Author: kotkov
Date: Thu Jun 19 15:29:53 2014
New Revision: 1603921

URL: http://svn.apache.org/r1603921
Log:
Do not check whether the apu_version.h file exists in the supplied APR-Util
location *twice*.  os.path.isfile(path) implicates os.path.exists(path), so
the second check effectively does nothing.

* build/generator/gen_win_dependencies.py
  (_find_apr_util_and_expat): Only check for the existence of the
    'apu_version.h' once.

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=1603921&r1=1603920&r2=1603921&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Thu Jun 19 15:29:53 2014
@@ -429,12 +429,6 @@ class GenDependenciesBase(gen_base.Gener
       sys.exit(1)
 
     version_file_path = os.path.join(inc_path, 'apu_version.h')
-
-    if not os.path.exists(version_file_path):
-      sys.stderr.write("ERROR: '%s' not found.\n" % version_file_path);
-      sys.stderr.write("Use '--with-apr-util' option to configure APR-Util location.\n");
-      sys.exit(1)
-
     txt = open(version_file_path).read()
 
     vermatch = re.search(r'^\s*#define\s+APU_MAJOR_VERSION\s+(\d+)', txt, re.M)