From: Holger Levsen <holger@layer-acht.org>
Date: Fri, 2 Sep 2011 14:55:46 +0000 (+0200)
Subject: enable atexit again
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=07677bb5d4e82a175901c104744ad638c60d30ad;p=profitbricks%2Fjenkins-build-scripts.git

enable atexit again
---

diff --git a/build.py b/build.py
index f7aed15..101f531 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:
@@ -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']