From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Tue, 4 Jun 2013 10:40:01 +0000 (+0200)
Subject: debian_build: abort if rebase failed
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=7654eb6b3e3221c0ffbd071f51c822eff15abb28;p=profitbricks%2Fjenkins-build-scripts.git

debian_build: abort if rebase failed
---

diff --git a/debian_build.py b/debian_build.py
index bb2c94a..f340f3e 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -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