From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Fri, 21 Jun 2013 14:04:52 +0000 (+0200)
Subject: debian_build: issue warning in manual build instructions
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=992abe8ca7fa22addb71ccabb405c58ea6d17b80;p=profitbricks%2Fjenkins-build-scripts.git

debian_build: issue warning in manual build instructions
---

diff --git a/debian_build.py b/debian_build.py
index 6ed54bb..2e7af6a 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -482,6 +482,8 @@ export {gbp_env} FORCE_SHELL=TRUE
 {command}
 
 ###
+### Beware when using 'merge' trigger: The above command specifies the target
+### branch already while you want to run on original branch '{orig_branch}'.
 ###
 '''.format(
             hostname=socket.gethostname(),
@@ -491,6 +493,7 @@ export {gbp_env} FORCE_SHELL=TRUE
                               for key in gbp.env.keys()
                             ]),
             command=' '.join(gbp.command),
+            orig_branch=ENV['GIT_BRANCH'],
         ))
 
     # .. and finally handle the result