Merge "Ease python 3 classifier check in check_python3_support_for_package_local"

This commit is contained in:
Zuul 2019-03-22 05:22:30 +00:00 committed by Gerrit Code Review
commit d52b2f5043
1 changed files with 5 additions and 1 deletions

View File

@ -101,7 +101,7 @@ function check_python3_support_for_package_local {
cd $name
set +e
classifier=$(python setup.py --classifiers \
| grep 'Programming Language :: Python :: 3$')
| grep 'Programming Language :: Python :: 3')
set -e
echo $classifier
}
@ -297,6 +297,8 @@ function pip_install {
echo "Automatically using $PYTHON3_VERSION version to install $package_dir based on local package settings"
sudo_pip="$sudo_pip LC_ALL=en_US.UTF-8"
cmd_pip=$(get_pip_command $PYTHON3_VERSION)
else
echo "WARNING: Did not find python 3 classifier for local package $package_dir"
fi
fi
else
@ -307,6 +309,8 @@ function pip_install {
echo "Automatically using $PYTHON3_VERSION version to install $package based on remote package settings"
sudo_pip="$sudo_pip LC_ALL=en_US.UTF-8"
cmd_pip=$(get_pip_command $PYTHON3_VERSION)
else
echo "WARNING: Did not find python 3 classifier for remote package $package_dir"
fi
fi
fi