]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
enable the atexit function again
authorRobin Wittler <robin.wittler@profitbricks.com>
Fri, 2 Sep 2011 10:20:16 +0000 (12:20 +0200)
committerRobin Wittler <robin.wittler@profitbricks.com>
Fri, 2 Sep 2011 10:20:16 +0000 (12:20 +0200)
build.py

index 78a258ba6dc62fd56fce693c5ac7b518c36b4cd4..16c20187a7848e4496dfee87de8f92415d55b7d1 100755 (executable)
--- 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_)