openstack/devstack
Code Issues Proposed changes

Fix handling of pip and virtualenv on openSUSE

Browse Source 
openSUSE's python-virtualenv rpm depends on the python-pip rpm, but
tools/install_pip.sh prefers to deinstall the latter (if installed) and
install pip directly from upstream source instead.

This deinstallation of python-pip will break if attempted via rpm -e,
since rpm does not transitively remove dependents (in this case
python-virtualenv).  In contrast, "zypper rm" does, so we switch to
that.

It is safe to remove the python-virtualenv package, since stack.sh will
install virtualenv via pip instead.

Change-Id: I5bc23de0f2de2e3940c4be3b76b7c0634836239b
This commit is contained in:
Adam Spiers 2013-10-01 15:59:05 +01:00
parent 1c1aef0eb7
commit 6d8fce7325
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/rpms-suse/general
View File

@ -10,7 +10,6 @@ python-setuptools # instead of python-distribute; dist:sle11sp2
python-cmd2 # dist:opensuse-12.3 python-cmd2 # dist:opensuse-12.3
python-pylint python-pylint
python-unittest2 python-unittest2
python-virtualenv
screen screen
tar tar
tcpdump tcpdump

2
functions
View File

@ -926,7 +926,7 @@ function uninstall_package() {
elif is_fedora; then elif is_fedora; then
sudo yum remove -y "$@" sudo yum remove -y "$@"
elif is_suse; then elif is_suse; then
sudo rpm -e "$@" sudo zypper rm "$@"
else else
exit_distro_not_supported "uninstalling packages" exit_distro_not_supported "uninstalling packages"
fi fi