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 <catalin.marinas@gmail.com>

diff --git a/setup.py b/setup.py
index 73ce2e58d6bfbac09f80f7c13f8d9dd16363f00c..3f5ccb27ae9c46db164af23874411b0b2abecd1b 100755 (executable)
--- 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)
 
 # 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)
 
 # restore the old mask
 os.umask(old_mask)

diff --git a/stgit/.gitignore b/stgit/.gitignore
index 0d20b6487c61e7d1bde93acf4a14b7a89083a16d..9e7f7139067fbd8da99f0f6cab34c423271a9a67 100644 (file)
--- a/stgit/.gitignore
+++ b/stgit/.gitignore
@@ -1 +1,2 @@
 *.pyc
 *.pyc

+builtin_version.py

diff --git a/stgit/version.py b/stgit/version.py
index 948a70b55e6bd6a132bfed2529af1aa06c349890..94f89a8606472d48a0712107d73da8fa19b04154 100644 (file)
--- 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)
 
     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:
 def get_version():
     for v in [builtin_version, git_describe_version]:
         try: