Skip to content

Commit 5d719d0

Browse files
committed
Fixed case where alternate deactivate didn't exist
1 parent e76c9ec commit 5d719d0

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

virtualenvwrapper.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,11 +751,15 @@ function workon {
751751
# before switching so we use our override function,
752752
# if it exists, but make sure it's the deactivate function
753753
# we set up
754-
type deactivate | grep 'typeset env_postdeactivate_hook' >/dev/null 2>&1
754+
type deactivate >/dev/null 2>&1
755755
if [ $? -eq 0 ]
756756
then
757-
deactivate
758-
unset -f deactivate >/dev/null 2>&1
757+
type deactivate | grep 'typeset env_postdeactivate_hook' >/dev/null 2>&1
758+
if [ $? -eq 0 ]
759+
then
760+
deactivate
761+
unset -f deactivate >/dev/null 2>&1
762+
fi
759763
fi
760764

761765
virtualenvwrapper_run_hook "pre_activate" "$env_name"

0 commit comments

Comments
 (0)