diff --git a/libexec/pyenv-version-name b/libexec/pyenv-version-name index c15178e2..7ed2a197 100755 --- a/libexec/pyenv-version-name +++ b/libexec/pyenv-version-name @@ -21,6 +21,7 @@ version_exists() { versions=() OLDIFS="$IFS" { IFS=: + any_not_installed=0 for version in ${PYENV_VERSION}; do if version_exists "$version" || [ "$version" = "system" ]; then versions=("${versions[@]}" "${version}") @@ -31,7 +32,7 @@ OLDIFS="$IFS" versions=("${versions[@]}" "${version#python-}") else echo "pyenv: version \`$version' is not installed" >&2 - exit 1 + any_not_installed=1 fi done } @@ -42,3 +43,7 @@ OLDIFS="$IFS" echo "${versions[*]}" } IFS="$OLDIFS" + +if [ "$any_not_installed" = 1 ]; then + exit 1 +fi diff --git a/test/version-name.bats b/test/version-name.bats index 2d7ebe20..2556e005 100644 --- a/test/version-name.bats +++ b/test/version-name.bats @@ -52,6 +52,26 @@ setup() { assert_failure "pyenv: version \`1.2' is not installed" } +@test "one missing version (second missing)" { + create_version "3.4.2" + PYENV_VERSION="3.4.2:1.2" run pyenv-version-name + assert_failure + assert_output < ".python-version" <<<"python-2.7.6" diff --git a/test/version.bats b/test/version.bats index 296cfd59..8d933d28 100644 --- a/test/version.bats +++ b/test/version.bats @@ -36,3 +36,24 @@ setup() { run pyenv-version assert_success "3.3.3 (set by ${PYENV_ROOT}/version)" } + +@test "set by PYENV_VERSION, one missing" { + create_version "3.3.3" + PYENV_VERSION=3.3.3:1.2 run pyenv-version + assert_success + assert_output <