]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
install-deps.sh: always use python3-sphinx to build the docs 35770/head
authorKefu Chai <kchai@redhat.com>
Thu, 25 Jun 2020 11:54:55 +0000 (19:54 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 25 Jun 2020 11:59:41 +0000 (19:59 +0800)
commit2d8da82b2309120d83a2341095e0dcd550d171da
treeb4a4e07c8bc4a2ed55dcf10c4e3ca8d2ac852d08
parentc70415b897e3e27673ad3273b5548754f54ed592
install-deps.sh: always use python3-sphinx to build the docs

python-sphinx creates a symlink pointing ../share/sphinx/scripts/python2/sphinx-build
to /usr/bin/sphinx-build even if python3-sphinx is already installed.
in that case, if python-sphinx is installed after python3-sphinx,
sphinx-build is in python2. and it breaks the build of master, as we are
using python3 syntax in conf.py since
e9e17b9ceff0c862c8f29d629ad54a1dc401ed73.

and we are still using python2 as well as "python-sphinx" when building nautilus,
so if a build slave happen to compile nautilus before it is scheduled to
build master or a wip- branch, the doc build fails.

in this change, python-sphinx is uninstalled, if /usr/bin/sphinx-build
is found to be written in python2.

Signed-off-by: Kefu Chai <kchai@redhat.com>
install-deps.sh