From: Mathias Klette <mathias.klette@profitbricks.com>
Date: Wed, 29 May 2013 12:07:56 +0000 (+0200)
Subject: common_code: GIT_BRANCH_NAME = GIT_BRANCH only if not already given
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=1ed79f86e2f52dffa2d1cb959ea005c841d83f1e;p=profitbricks%2Fjenkins-build-scripts.git

common_code: GIT_BRANCH_NAME = GIT_BRANCH only if not already given
---

diff --git a/common_code.py b/common_code.py
index 403c35d..f2ad5d8 100755
--- a/common_code.py
+++ b/common_code.py
@@ -48,7 +48,7 @@ def exit_error():
 ENV = os.environ
 ENV.setdefault('ARGV',' '.join(sys.argv))
 ENV.setdefault('CWD',os.getcwd())
-ENV['GIT_BRANCH_NAME'] = ENV['GIT_BRANCH']
+ENV.setdefault('GIT_BRANCH_NAME', ENV['GIT_BRANCH'])
 
 BIN_DCH = '/usr/bin/dch'
 BIN_DPUT = '/usr/bin/dput'