]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
bootstrap: support python3-virtualenv 497/head
authorChangcheng Liu <changcheng.liu@aliyun.com>
Tue, 2 Jun 2020 06:05:05 +0000 (14:05 +0800)
committerChangcheng Liu <changcheng.liu@aliyun.com>
Tue, 2 Jun 2020 06:05:05 +0000 (14:05 +0800)
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
bootstrap

index 2580fbc485c6a41abc52d9ea2cb697f5ea877556..c29bdc493c6d6f32e992657a4e91bebb94b312d6 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -8,13 +8,15 @@ if ! [ -d virtualenv ]; then
     if command -v lsb_release >/dev/null 2>&1; then
         if [ "$1" = "2" ]; then
             python_package="python"
+            python_virtualenv_package="python-virtualenv"
         else
             python_package="python$1"
+            python_virtualenv_package="python$1-virtualenv"
         fi
 
         case "$(lsb_release --id --short)" in
         Ubuntu|Debian)
-            for package in "$python_package" python-virtualenv; do
+            for package in "$python_package" "$python_virtualenv_package"; do
             if [ "$(dpkg --status -- "$package" 2>/dev/null|sed -n 's/^Status: //p')" != "install ok installed" ]; then
                 # add a space after old values
                 missing="${missing:+$missing }$package"