From 3ad3eab77a9e9429a1f9c837efe04446be2e954f Mon Sep 17 00:00:00 2001 From: Tails developers Date: Sun, 28 Jul 2013 14:55:08 +0200 Subject: [PATCH] Remove origin/ prefix in the branch name passed by Jenkins. The Jenkins SCM plugin syntax for branch specifiers is REPO/BRANCH. It has some helpful shortcuts, but in some cases (e.g. branches with a '/' in their name) we really need to specify origin/BRANCH. When origin/BRANCH is checked out, our custom APT source lists builder is confused and falls back to the `devel' APT suite, instead of using the branch's suite. So, we drop the `origin/' prefix from $REV before it's checked out. --- vagrant/provision/assets/build-tails | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/provision/assets/build-tails b/vagrant/provision/assets/build-tails index 5cbc2338f..92555d272 100755 --- a/vagrant/provision/assets/build-tails +++ b/vagrant/provision/assets/build-tails @@ -67,7 +67,7 @@ if [ -n "$JENKINS_URL" ]; then if [ -z "$GIT_COMMIT" ]; then echo "GIT_COMMIT environment variable is not set. Aborting." >&2 fi - REV="$GIT_BRANCH" + REV="${GIT_BRANCH##origin/}" COMMIT="$GIT_COMMIT" else # Build triggered by Vagrant -- 2.11.4.GIT