From: Robin Wittler <robin.wittler@profitbricks.com>
Date: Fri, 2 Sep 2011 10:20:16 +0000 (+0200)
Subject: enable the atexit function again
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=cef9eaded3ae1f5c41200987ad6201e7e5209fe0;p=profitbricks%2Fjenkins-build-scripts.git

enable the atexit function again
---

diff --git a/build.py b/build.py
index 78a258b..16c2018 100755
--- a/build.py
+++ b/build.py
@@ -250,7 +250,7 @@ if __name__ == '__main__':
         logger.info('git clone was not successfull')
         exit_error()
 
-    #atexit.register(remove_git_target_workspace)
+    atexit.register(remove_git_target_workspace)
     os.chdir(GIT_TARGET_DIR)
 
     if GIT_UPSTREAM_BRANCH != GIT_DEBIAN_BRANCH:
@@ -343,10 +343,12 @@ if __name__ == '__main__':
         logger.info('debian/changelog written')
 
 	# FIXME: are those 4 lines meaningful at all? i dont think so...
-        cmd = ['/usr/bin/git', 'add', '-A']
-        subprocess.check_call(cmd)
-        cmd = ['/usr/bin/git', 'commit', '-a', '-m', 'add changelog']
-        subprocess.check_call(cmd)
+        # commented in by rwittler. We dont need them if we use --ignore-new
+        # within git-buildpackage
+        #cmd = ['/usr/bin/git', 'add', '-A']
+        #subprocess.check_call(cmd)
+        #cmd = ['/usr/bin/git', 'commit', '-a', '-m', 'add changelog']
+        #subprocess.check_call(cmd)
     else:
 	# so we're in the master branch...
 	# (or maybe in other branches, but thats not specified _yet_)