]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
admin/build-doc: always install python3-* for build deps 32481/head
authorKefu Chai <kchai@redhat.com>
Sat, 4 Jan 2020 04:05:50 +0000 (12:05 +0800)
committerKefu Chai <kchai@redhat.com>
Sat, 4 Jan 2020 09:05:06 +0000 (17:05 +0800)
since we've dropped the support of python36-*, i.e. python packages
provided by EPEL7 before RHEL7/CentOS7 included python3. as before the
inclusion of python3 as supported python3, python packages are named
python36-*. and they don't provide python3-*. so we had to install
python36-* explicitly. now that we are able to use the python3-*
packages, we can just install python3-*.

Signed-off-by: Kefu Chai <kchai@redhat.com>
admin/build-doc

index 9c9a3c8d70a2ea9242c5ad65b9817f16643fc26e..866916072bdf17a4b91b487c9b41108657eeb684 100755 (executable)
@@ -20,8 +20,7 @@ if command -v dpkg >/dev/null; then
         exit 1
     fi
 elif command -v yum >/dev/null; then
-    python_package="python$(rpm --eval '%{python3_pkgversion}')"
-    for package in "$python_package"-devel "$python_package"-pip "$python_package"-virtualenv doxygen ditaa ant libxml2-devel libxslt-devel "$python_package"-Cython graphviz; do
+    for package in ant ditaa doxgen libxslt-devel libxml2-devel graphviz python3-devel python3-pip python3-virtualenv python3-Cython; do
        if ! rpm -q --whatprovides $package >/dev/null ; then
                missing="${missing:+$missing }$package"
        fi