lets try to get rid of the double clone

diff --git a/debian_build.py b/debian_build.py
index 6f89f784026b01bb5624402ba514ffa4aa7efa57..f750549f63f277801fc0cca38e0424020702ff3e 100755 (executable)
--- a/debian_build.py
+++ b/debian_build.py
@@ -415,10 +415,10 @@ if __name__ == '__main__':
     # we need to commit here else git-buildpackage will use the existing debian/changelog...
     # TODO: Later we should investigate why the "--ignore-new" trick
     # did not work!
-    #cmd = ['/usr/bin/git', 'add', '-A']
-    #subprocess.check_call(cmd)
-    #cmd = ['/usr/bin/git', 'commit', '-a', '-m', 'add new changelog entry']
-    #subprocess.check_call(cmd)
+    cmd = ['/usr/bin/git', 'add', '-A']
+    subprocess.check_call(cmd)
+    cmd = ['/usr/bin/git', 'commit', '-a', '-m', 'add new changelog entry']
+    subprocess.check_call(cmd)
 
     if options.distribution in ('experimental'):
       pb_suite='experimental'
@@ -437,6 +437,10 @@ if __name__ == '__main__':
 
     logger.info('used to start git-buildpackage here...')
     ret = gbp.build()
+    # remove last commit (the one where we added the changelog entry)
+    cmd = ['/usr/bin/git', 'reset', '--soft', 'HEAD~1']
+    subprocess.check_call(cmd)
+    # now handle gpb result
     if ret:
         logger_loud_error(
                 'git-buildpackage returned non-zero. exitcode was: %s' % ret