From 4267f313ab5be7c0deac51c12a30858a4ac75c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Fri, 26 Aug 2016 14:33:22 +0200
Subject: [PATCH] Refuse deploy early when Pillar can't be found or isn't on
 production

Without this, it will only block the deploy mid-way when we try to
rsync_ui. Now it just stops early before doing anything server-side.
---
 deploy.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/deploy.sh b/deploy.sh
index 550cb7b..99b6cca 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -22,6 +22,24 @@ if [ -n "$(git log origin/production..production --oneline)" ]; then
     read dummy
 fi
 
+# Find Pillar
+PILLAR_DIR=$(python <<EOT
+from __future__ import print_function
+import os.path
+try:
+    import pillar
+except ImportError:
+    raise SystemExit('Pillar not found on Python path. Are you in the correct venv?')
+
+print(os.path.dirname(os.path.dirname(pillar.__file__)))
+EOT
+)
+if [ $(git -C $PILLAR_DIR rev-parse --abbrev-ref HEAD) != "production" ]; then
+    echo "Pillar ($PILLAR_DIR) NOT on the production branch, refusing to deploy." >&2
+    exit 1
+fi
+
+
 # SSH to cloud to pull all files in
 function git_pull() {
     PROJECT_NAME="$1"