]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
debian_build: abort if rebase failed
authorMathias Klette <mathias.klette@profitbricks.com>
Tue, 4 Jun 2013 10:40:01 +0000 (12:40 +0200)
committerMathias Klette <mathias.klette@profitbricks.com>
Tue, 4 Jun 2013 10:40:01 +0000 (12:40 +0200)
debian_build.py

index bb2c94a3cef5c1c03ec54745d1c84f325db4b126..f340f3e1d15d6b261dcc0ead91298eabf87fa294 100755 (executable)
@@ -344,6 +344,8 @@ if __name__ == '__main__':
                 ))
             except Exception as error:
                 logger.error('Rebase has failed!', exc_info=error)
+                gitrepo.git.reset('--hard',src_branch)
+                exit_error()
 
         if 'no-test' in build_triggers:
             # debian/rules from vdc-bundles determines maven options for tests