From: Holger Levsen Date: Fri, 19 Aug 2011 12:54:46 +0000 (+0200) Subject: try to get it working X-Git-Url: https://git.uhu-banane.org/?a=commitdiff_plain;h=c1e124f016ca8b11da186c2138284d93f3446726;p=profitbricks%2Fjenkins-build-scripts.git try to get it working --- diff --git a/build.py b/build.py index 457b507..4c1d779 100755 --- 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')