]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
install-deps.sh: s/get_pip_and_wheel/populate_wheelhouse/ 4856/head
authorKefu Chai <kchai@redhat.com>
Thu, 4 Jun 2015 08:00:45 +0000 (16:00 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 4 Jun 2015 08:01:17 +0000 (16:01 +0800)
Signed-off-by: Kefu Chai <kchai@redhat.com>
install-deps.sh

index 70f35b33995ab3194d427c7283ebc99c98539257..6d3a5de92aa1c035ed9f44b31f8b5829bf910343 100755 (executable)
@@ -84,7 +84,7 @@ CentOS|Fedora|RedHatEnterpriseServer)
         ;;
 esac
 
-function get_pip_and_wheel() {
+function populate_wheelhouse() {
     local install=$1
     shift
 
@@ -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
@@ -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