diff options
author | Simon Warta <[email protected]> | 2017-02-26 21:02:18 +0100 |
---|---|---|
committer | Simon Warta <[email protected]> | 2017-02-26 21:04:29 +0100 |
commit | 227a886c840a44e4f6e689d4f6eb3e75c7a1c029 (patch) | |
tree | 3436514f38aa85479f6b09e947f9863bb1d81c6e | |
parent | 438d96e6a8cb14f3d8d780623bf85936ceea361b (diff) |
Configure: rename variables to avoid redefining builtins
-rwxr-xr-x | configure.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.py b/configure.py index b4cea7af7..7e40545dd 100755 --- a/configure.py +++ b/configure.py @@ -2367,12 +2367,12 @@ def main(argv=None): if e.errno != errno.ENOENT: logging.error('Problem while removing build dir: %s' % (e)) - for dir in build_config.build_dirs: + for build_dir in build_config.build_dirs: try: - robust_makedirs(dir) + robust_makedirs(build_dir) except OSError as e: if e.errno != errno.EEXIST: - logging.error('Error while creating "%s": %s' % (dir, e)) + logging.error('Error while creating "%s": %s' % (build_dir, e)) def write_template(sink, template): try: @@ -2397,15 +2397,15 @@ def main(argv=None): link_method = choose_link_method(options) - def link_headers(headers, type, dir): - logging.debug('Linking %d %s header files in %s' % (len(headers), type, dir)) + def link_headers(headers, visibility, directory): + logging.debug('Linking %d %s header files in %s' % (len(headers), visibility, directory)) for header_file in headers: try: - portable_symlink(header_file, dir, link_method) + portable_symlink(header_file, directory, link_method) except OSError as e: if e.errno != errno.EEXIST: - raise ConfigureError('Error linking %s into %s: %s' % (header_file, dir, e)) + raise ConfigureError('Error linking %s into %s: %s' % (header_file, directory, e)) link_headers(build_config.public_headers, 'public', build_config.botan_include_dir) |