Import recent changes from rbenv 4d72eefffc

This commit is contained in:
Yamashita Yuu 2015-03-07 01:01:32 +09:00
parent efe461d2b4
commit f48a5b11d7
3 changed files with 3 additions and 9 deletions

View file

@ -1,4 +1,5 @@
install: git clone https://github.com/sstephenson/bats.git
sudo: false
install: git clone --depth 1 https://github.com/sstephenson/bats.git
script: make test
language: c
env:

View file

@ -25,9 +25,6 @@ OLDIFS="$IFS"
if version_exists "$version" || [ "$version" = "system" ]; then
versions=("${versions[@]}" "${version}")
elif version_exists "${version#python-}"; then
{ echo "warning: ignoring extraneous \`python-' prefix in version \`${version}'"
echo " (set by $(pyenv-version-origin))"
} >&2
versions=("${versions[@]}" "${version#python-}")
else
echo "pyenv: version \`$version' is not installed" >&2

View file

@ -57,9 +57,5 @@ setup() {
cat > ".python-version" <<<"python-2.7.6"
run pyenv-version-name
assert_success
assert_output <<OUT
warning: ignoring extraneous \`python-' prefix in version \`python-2.7.6'
(set by ${PWD}/.python-version)
2.7.6
OUT
assert_output "2.7.6"
}