push/pop: Allow "-n0" to do nothing

[stgit] / setup.py

diff --git a/setup.py b/setup.py
index fb67958..3f5ccb2 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -58,8 +58,7 @@ def __run_setup():
             ('share/stgit/templates', glob.glob('templates/*.tmpl')),
             ('share/stgit/examples', glob.glob('examples/*.tmpl')),
             ('share/stgit/examples', ['examples/gitconfig']),
-            ('share/stgit/contrib', ['contrib/diffcol.sh',
-                                     'contrib/stgbashprompt.sh']),
+            ('share/stgit/contrib', ['contrib/stgbashprompt.sh']),
             ('share/stgit/completion', ['stgit-completion.bash'])
             ])
 
@@ -71,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)