From ba69dd46a02efd39b1984a94e4088a7f3c687df2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 10 May 2019 14:19:44 +0200
Subject: [PATCH] Staging: be more selective about which branch of
 pillar-python-sdk to use

Because pillar-python-sdk doesn't have a `production` branch, it was always
using `master`. Now it's only using `master` if `STAGING_BRANCH`=`production`.
---
 deploy/2docker.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/deploy/2docker.sh b/deploy/2docker.sh
index 2d14d0a..8a653f9 100755
--- a/deploy/2docker.sh
+++ b/deploy/2docker.sh
@@ -91,7 +91,13 @@ function git_clone() {
     git -C $STAGINGDIR clone --depth 1 --branch $BRANCH $URL $PROJECT_NAME
 }
 
-git_clone pillar-python-sdk master $SDK_DIR
+if [ "$STAGING_BRANCH" == "production" ]; then
+    SDK_STAGING_BRANCH=master  # SDK doesn't have a production branch
+else
+    SDK_STAGING_BRANCH=$STAGING_BRANCH
+fi
+
+git_clone pillar-python-sdk $SDK_STAGING_BRANCH $SDK_DIR
 git_clone pillar $STAGING_BRANCH $PILLAR_DIR
 git_clone attract $STAGING_BRANCH $ATTRACT_DIR
 git_clone flamenco $STAGING_BRANCH $FLAMENCO_DIR