Reset +e prior to autodeployer deploys else second deploy fails (#1057)

enterprisemediawiki · Nov 7, 2018 · 531b203 · 531b203
1 parent 30c1412
commit 531b203
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/scripts/autodeployer/do-deploy.sh b/src/scripts/autodeployer/do-deploy.sh
@@ -88,6 +88,9 @@ if [ $? -eq 0 ]; then
 	source $NOTIFY "$DEPLOY_TYPE complete" "good"
 else
 	source $NOTIFY "$DEPLOY_TYPE attempt failed. Retrying..." "warning"
+
+	# sourcing scripts above may reset -e. Explicitly set prior to meza deploy
+	set +e
 	meza deploy "$m_environment" $DEPLOY_ARGS \
 		> /opt/data-meza/logs/${LOG_PREFIX}`date "+%Y%m%d%H%M%S"`.log 2>&1
 
@@ -98,6 +101,7 @@ else
 	fi
 fi
 
+set -e