move GIT_BRANCH_NAME definitions from common_code to debian_build (again)

diff --git a/common_code.py b/common_code.py
index 2cb344cf6e1cca6463dc7116a7db8003a074bf22..aaa3637d4c240d62a5a290f3abe2a5a032be754f 100755 (executable)
--- a/common_code.py
+++ b/common_code.py
@@ -31,7 +31,7 @@ def logger_init(
             else:
                 log_level = logging.DEBUG
         except KeyError as e:
-            log_level = logging.NOTSET
+            log_level = logging.WARN
 
     logging.basicConfig(
         format = log_format,
@@ -52,9 +52,6 @@ def exit_error():
 ENV = os.environ
 ENV.setdefault('ARGV',' '.join(sys.argv))
 ENV.setdefault('CWD',os.getcwd())
-ENV.setdefault('GIT_BRANCH_NAME', ENV['GIT_BRANCH'])
-if ENV['GIT_BRANCH'] != ENV['GIT_BRANCH_NAME']:
-    ENV['GIT_BRANCH'] = ENV['GIT_BRANCH_NAME']
 
 BIN_DCH = '/usr/bin/dch'
 BIN_DPUT = '/usr/bin/dput'

diff --git a/debian_build.py b/debian_build.py
index ae16261714c1b38f3018ccad747144739ae66150..6ed54bb7ea4fd97e432fb170ace6069691db098b 100755 (executable)
--- a/debian_build.py
+++ b/debian_build.py
@@ -34,6 +34,9 @@ logger = logger_init(re.match('^(.*/jenkins_build_script/)(.*)',__file__).groups
 # jenkins environment - parameters
 ENV.setdefault('NO_UPLOAD', '')
 ENV.setdefault('BUILD_TRIGGERS', '')
+ENV.setdefault('GIT_BRANCH_NAME', ENV['GIT_BRANCH'])
+if ENV['GIT_BRANCH'] != ENV['GIT_BRANCH_NAME']:
+    ENV['GIT_BRANCH'] = ENV['GIT_BRANCH_NAME']
 #ENV.setdefault('DISTRIBUTION', 'squeeze')
 #GIT_REPO_PATH = ENV['GIT_REPO_PATH']