From a3d0baefbc492bd8aee6d1cb7e992015beb87ea8 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Sat, 17 Oct 2009 22:34:10 +0100 Subject: [PATCH] Do not delete the builtin_version.py file after setup If setup is run in a directory without .git, setup.py deletes the stgit/builtin_version.py file and subsequent commands no longer have a version. See bug #14480. Signed-off-by: Catalin Marinas --- setup.py | 7 ++----- stgit/.gitignore | 1 + stgit/version.py | 6 ------ 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/setup.py b/setup.py index 73ce2e5..3f5ccb2 100755 --- a/setup.py +++ b/setup.py @@ -70,11 +70,8 @@ if sys.argv[1] in ['install', 'build']: # ensure readable template files old_mask = os.umask(0022) -try: - version.write_builtin_version() - __run_setup() -finally: - version.delete_builtin_version() +version.write_builtin_version() +__run_setup() # restore the old mask os.umask(old_mask) diff --git a/stgit/.gitignore b/stgit/.gitignore index 0d20b64..9e7f713 100644 --- a/stgit/.gitignore +++ b/stgit/.gitignore @@ -1 +1,2 @@ *.pyc +builtin_version.py diff --git a/stgit/version.py b/stgit/version.py index 948a70b..94f89a8 100644 --- a/stgit/version.py +++ b/stgit/version.py @@ -43,12 +43,6 @@ def write_builtin_version(): f.write('# This file was generated automatically. Do not edit by hand.\n' 'version = %r\n' % v) -def delete_builtin_version(): - for ext in ['py', 'pyc', 'pyo']: - fn = _builtin_version_file(ext) - if os.path.exists(fn): - os.remove(fn) - def get_version(): for v in [builtin_version, git_describe_version]: try: -- 2.11.0