Browse code

Merge "Never uninstall python-pip on fedora"

Jenkins authored on 2016/01/29 14:19:09
Showing 1 changed files
... ...
@@ -117,8 +117,10 @@ get_versions
117 117
 
118 118
 # Eradicate any and all system packages
119 119
 
120
-# python in f23 depends on the python-pip package
121
-if ! { is_fedora && [[ $DISTRO == "f23" ]]; }; then
120
+# Python in f23 and f22 depends on the python-pip package so removing it
121
+# results in a nonfunctional system. pip on fedora installs to /usr so pip
122
+# can safely override the system pip for all versions of fedora
123
+if ! is_fedora ; then
122 124
     uninstall_package python-pip
123 125
     uninstall_package python3-pip
124 126
 fi