only run deactivate if it exists

rhansen · rhansen · commit 6b298c692a65 · 2016-01-31T16:12:58.000-05:00
The deactivate command only exists if activate is run, but cleanup()
might be called before activate is run if there is an error.
diff --git a/tools/build_test_env.sh b/tools/build_test_env.sh
@@ -54,7 +54,7 @@ cleanup() {
     rm -f /tmp/python-gitlab.cfg
     docker kill gitlab-test >/dev/null 2>&1
     docker rm gitlab-test >/dev/null 2>&1
-    deactivate || true
+    command -v deactivate >/dev/null 2>&1 && deactivate || true
     rm -rf $VENV
 }
 [ -z "${BUILD_TEST_ENV_AUTO_CLEANUP+set}" ] || {

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ cleanup() {`
`54`	`54`	`rm -f /tmp/python-gitlab.cfg`
`55`	`55`	`docker kill gitlab-test >/dev/null 2>&1`
`56`	`56`	`docker rm gitlab-test >/dev/null 2>&1`
`57`		`- deactivate \|\| true`
	`57`	`+ command -v deactivate >/dev/null 2>&1 && deactivate \|\| true`
`58`	`58`	`rm -rf $VENV`
`59`	`59`	`}`
`60`	`60`	`[ -z "${BUILD_TEST_ENV_AUTO_CLEANUP+set}" ] \|\| {`