From: Holger Levsen <holger@layer-acht.org>
Date: Wed, 8 Feb 2012 17:37:38 +0000 (+0100)
Subject: lets try to get rid of the double clone
X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a0a3687dd37b8623dc7711b91d8a8bd57ced1b26;p=profitbricks%2Fjenkins-build-scripts.git

lets try to get rid of the double clone
---

diff --git a/debian_build.py b/debian_build.py
index 6549ded..686c5d8 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -259,9 +259,10 @@ if __name__ == '__main__':
 
     repo = git.repo.Repo()
 
-    if GIT_BRANCH_NAME != 'master':
+    #if GIT_BRANCH_NAME != 'master':
         #git_helper.git_new_branch_from(
-        git_helper.git_checkout_branch(
+    # FIXME: error checking... (as below)
+    git_helper.git_checkout_branch(
                 GIT_BRANCH_NAME) #,
         #        os.path.join('origin', GIT_BRANCH_NAME)
         #)
@@ -275,11 +276,11 @@ if __name__ == '__main__':
     #)
 
     # now checkout the requested branch
-    if git_helper.git_checkout_branch(GIT_UPSTREAM_BRANCH):
-        logger.info('git checkout %s was successfull' % GIT_UPSTREAM_BRANCH)
-    else:
-        logger_loud_error('git checkout %s was not successfull' % GIT_UPSTREAM_BRANCH)
-        exit_error()
+    #if git_helper.git_checkout_branch(GIT_UPSTREAM_BRANCH):
+    #    logger.info('git checkout %s was successfull' % GIT_UPSTREAM_BRANCH)
+    #else:
+    #    logger_loud_error('git checkout %s was not successfull' % GIT_UPSTREAM_BRANCH)
+    #    exit_error()
 
     # we need to make sure our jenkins config is used, so let's delete any 
     # other config available in repository that might be prefered