From 1fa037e86a9a1edad3a5e2bef3b15f61104ae714 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Fri, 14 Jun 2013 07:32:25 +0100
Subject: Look for the workspace in both known places

---
 jenkinstool | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/jenkinstool b/jenkinstool
index 9f25c43..c9655f0 100755
--- a/jenkinstool
+++ b/jenkinstool
@@ -131,7 +131,15 @@ project_url="%(global.artifacts-url)s/$project"
 pbuilder_ci_tgz=/var/cache/pbuilder/ci.tgz
 pbuilder_release_tgz=/var/cache/pbuilder/release.tgz
 
-vcsworkspace="/var/lib/jenkins/jobs/${project}_localhost_vcs-update/workspace"
+
+vcsproject="${project}_localhost_vcs-update"
+if [ -d "/var/lib/jenkins/jobs/${vcsproject}/workspace" ]
+then
+    vcsworkspace="/var/lib/jenkins/jobs/${vcsproject}/workspace"
+else
+    vcsworkspace="/var/lib/jenkins/workspace/${vcsproject}"
+fi
+
 workdir="$(pwd)"
 if [ -e "$vcsworkspace" ] || [ "$have_vcs_copy" = yes ]]
 then
-- 
cgit v1.2.1