| 1 |
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py |
| 2 |
--- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py 2015-10-29 14:23:19.000000000 +0000 |
| 3 |
+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2015-12-07 17:36:49.070000000 +0000 |
| 4 |
@@ -481,12 +481,16 @@ |
| 5 |
@property |
| 6 |
def mirrorEnabled(self): |
| 7 |
with _yum_lock: |
| 8 |
- # yum initializes with plugins disabled, and when plugins are disabled |
| 9 |
- # _yum.plugins is a DummyYumPlugins object, which has no useful attributes. |
| 10 |
- if hasattr(self._yum.plugins, "_plugins"): |
| 11 |
- return "fastestmirror" in self._yum.plugins._plugins |
| 12 |
+ # we just skip this on CentOS since we cant support it yet |
| 13 |
+ if productName.startswith("CentOS"): |
| 14 |
+ return False |
| 15 |
else: |
| 16 |
- return False |
| 17 |
+ # yum initializes with plugins disabled, and when plugins are disabled |
| 18 |
+ # _yum.plugins is a DummyYumPlugins object, which has no useful attributes. |
| 19 |
+ if hasattr(self._yum.plugins, "_plugins"): |
| 20 |
+ return "fastestmirror" in self._yum.plugins._plugins |
| 21 |
+ else: |
| 22 |
+ return False |
| 23 |
|
| 24 |
def getRepo(self, repo_id): |
| 25 |
""" Return the yum repo object. """ |
| 26 |
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py |
| 27 |
--- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py 2015-12-07 21:29:36.058347960 +0000 |
| 28 |
+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2015-12-07 21:32:50.255770594 +0000 |
| 29 |
@@ -43,6 +43,7 @@ |
| 30 |
from pyanaconda.iutil import execReadlines |
| 31 |
from pyanaconda.simpleconfig import simple_replace |
| 32 |
from functools import wraps |
| 33 |
+from pyanaconda.product import productName |
| 34 |
|
| 35 |
import logging |
| 36 |
log = logging.getLogger("packaging") |
Parent Directory
| 
Revision Log
| 
Revision Graph
