From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 2 Nov 2011 16:09:23 +0000 (+0100)
Subject: jaja
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=0ac7704750f6c2a8c96cc1c2a3830bd5418deb22;p=profitbricks%2Fjenkins-build-scripts.git

jaja
---

diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py
index 6bf88b1..5277e9b 100644
--- a/kernel_inpbuilder.py
+++ b/kernel_inpbuilder.py
@@ -381,15 +381,16 @@ if __name__ == '__main__':
     os.environ['WORKSPACE']=cmd_folder  # needed by kernel_persistence
     import kernel_persistence
 
+    PB_SUITE = os.environ.get('PB_SUITE')
+
     GIT_BRANCH_NAME = (
             os.environ.get('GIT_BRANCH_NAME') or options.git_branch_name
     )
     if not GIT_BRANCH_NAME:
         # try to get it from persistence
         try:
-            PB_SUITE = os.environ.get('PB_SUITE')
             kernel_revision_obj = kernel_persistence.get_last_kernel_revision_obj(PB_SUITE)  
-            GIT_BRANCH_NAME=kernel_revision_obj.branch
+            GIT_BRANCH_NAME=kernel_revision_obj.branch_name
         except:
             logger.error('No git branch name given and no persistence for %s neither' % PB_SUITE)
             exit(ERROR)