Skip to content

Commit

Permalink
install-deps.sh: s/get_pip_and_wheel/populate_wheelhouse/
Browse files Browse the repository at this point in the history
Signed-off-by: Kefu Chai <[email protected]>
  • Loading branch information
tchaikov committed Jun 4, 2015
1 parent b23fd40 commit 17a74ed
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions install-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ CentOS|Fedora|RedHatEnterpriseServer)
;;
esac

function get_pip_and_wheel() {
function populate_wheelhouse() {
local install=$1
shift

Expand All @@ -106,7 +106,7 @@ function activate_virtualenv() {
if ! test -d $env_dir ; then
virtualenv --python $interpreter $env_dir
. $env_dir/bin/activate
if ! get_pip_and_wheel install ; then
if ! populate_wheelhouse install ; then
rm -rf $env_dir
return 1
fi
Expand All @@ -133,7 +133,7 @@ find . -name tox.ini | while read ini ; do
for interpreter in python2.7 python3 ; do
type $interpreter > /dev/null 2>&1 || continue
activate_virtualenv $top_srcdir $interpreter || exit 1
get_pip_and_wheel "wheel -w $wip_wheelhouse" $require || exit 1
populate_wheelhouse "wheel -w $wip_wheelhouse" $require || exit 1
done
mv $wip_wheelhouse wheelhouse
fi
Expand Down

0 comments on commit 17a74ed

Please sign in to comment.