]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
bootstrap: fixes for openSUSE 740/head
authorNathan Cutler <ncutler@suse.com>
Mon, 7 Dec 2015 13:17:09 +0000 (14:17 +0100)
committerNathan Cutler <ncutler@suse.com>
Mon, 7 Dec 2015 13:21:06 +0000 (14:21 +0100)
When a package is found not to exist, we need to also check if there
is another package installed that provides a capability of the same
name.

Also, the python-devel package must be installed, or the pip phase
fails.

http://tracker.ceph.com/issues/14002 Fixes: #14002

Signed-off-by: Nathan Cutler <ncutler@suse.com>
bootstrap

index 139fa6802a5341a376be71f504c01a630cd3ba0d..e743c0a06a05aa8e5971cbe9d1505510098f4bb9 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -66,9 +66,11 @@ Linux)
        fi
        ;;
     "openSUSE project"|"SUSE LINUX")
-        for package in python-pip python-virtualenv libev-devel libvirt-python libmysqlclient-devel libffi-devel; do
+        for package in python-pip python-devel python-virtualenv libev-devel libvirt-python libmysqlclient-devel libffi-devel; do
             if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
-                missing="${missing:+$missing }$package"
+                if [ "$(rpm -q --whatprovides $package)" == "no package provides $package" ]; then
+                    missing="${missing:+$missing }$package"
+                fi
             fi
         done
         if [ -n "$missing" ]; then