]> Frank Brehm's Git Trees - profitbricks/jenkins-build-scripts.git/commitdiff
try to get it working
authorHolger Levsen <holger@layer-acht.org>
Fri, 19 Aug 2011 12:54:46 +0000 (14:54 +0200)
committerHolger Levsen <holger@layer-acht.org>
Fri, 19 Aug 2011 12:54:46 +0000 (14:54 +0200)
build.py

index 457b507d9b471dd0c701d510e437ac1428bde031..4c1d779b936c8cdfc17f32de504867655ad47ac7 100755 (executable)
--- a/build.py
+++ b/build.py
@@ -260,10 +260,10 @@ if __name__ == '__main__':
         )
 
     repo = git.repo.Repo()
-
     # hacked by holger
-#    if repo.active_branch != 'master' and GIT_DEBIAN_BRANCH != 'master':
-    if GIT_DEBIAN_BRANCH != 'master':
+    repo.checkout('develop')
+    
+    if repo.active_branch != 'master' and GIT_DEBIAN_BRANCH != 'master':
         git_helper.git_checkout_branch(GIT_DEBIAN_BRANCH)
 
     pb_version_path = os.path.join('debian', 'pb_version')