]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
enable atexit again
authorHolger Levsen <holger@layer-acht.org>
Fri, 2 Sep 2011 14:55:46 +0000 (16:55 +0200)
committerHolger Levsen <holger@layer-acht.org>
Fri, 2 Sep 2011 14:55:46 +0000 (16:55 +0200)
build.py

index f7aed159c16b38a260b0f5c3f29ee9afc299c505..101f53150fce359ff37f13b8b5c57150e95f4f9b 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:
@@ -320,7 +320,6 @@ if __name__ == '__main__':
                 '%s' %(''.join(git_log.stdout.read()))
         ]
         #        '%s' %(git_log_output)
-        #        '%s' %(''.join(git_log.stdout.read()))
 
         logger.debug('Trying to call: %s' %(cmd))      
 
@@ -342,9 +341,7 @@ if __name__ == '__main__':
             )
         logger.info('debian/changelog written')
 
-       # FIXME: are those 4 lines meaningful at all? i dont think so...
-        # commented in by rwittler. We dont need them if we use --ignore-new
-        # within git-buildpackage
+        # we need to commit here else git-buildpackage will use the existing debian/changelog... 
         cmd = ['/usr/bin/git', 'add', '-A']
         subprocess.check_call(cmd)
         cmd = ['/usr/bin/git', 'commit', '-a', '-m', 'add changelog']