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

[ko...@apache.org]

Author: kotkov
Date: Thu Jun 19 14:46:37 2014
New Revision: 1603901

URL: http://svn.apache.org/r1603901
Log:
Following up on r1504501, gracefully exit in situations when the APR include
is missing instead of throwing out a cryptic stacktrace ("... local variable
'version_file_path' referenced before assignment").

* build/generator/gen_win_dependencies.py
  (_find_apr): Do not attempt to use the uninitialized 'version_file_path'
    variable in the error message, because we initialize it later.  Just
    stick to the same as in the _find_apr_util_and_expat(), i.e. use the
    hardcoded filename in the error message.

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=1603901&r1=1603900&r2=1603901&view=diff
==============================================================================
--- subversion/trunk/build/generator/gen_win_dependencies.py (original)
+++ subversion/trunk/build/generator/gen_win_dependencies.py Thu Jun 19 14:46:37 2014
@@ -321,7 +321,7 @@ class GenDependenciesBase(gen_base.Gener
     elif os.path.isfile(os.path.join(inc_base, 'apr_version.h')):
       inc_path = inc_base
     else:
-      sys.stderr.write("ERROR: '%s' not found.\n" % version_file_path)
+      sys.stderr.write("ERROR: 'apr_version' not found.\n")
       sys.stderr.write("Use '--with-apr' option to configure APR location.\n")
       sys.exit(1)