|
 |
6e5b62 |
diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py
|
|
|
6e5b62 |
--- anaconda-21.48.22.121.orig/pyananconda/packaging/yumpayload.py 2017-08-31 16:28:06.672265889 +0000
|
|
|
6e5b62 |
+++ anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py 2017-08-31 16:28:38.812826778 +0000
|
|
|
6e5b62 |
@@ -42,6 +42,7 @@ import time
|
|
|
6e5b62 |
import hashlib
|
|
|
6e5b62 |
from pyanaconda.packaging import SSLOptions
|
|
|
6e5b62 |
from pyanaconda.iutil import execReadlines, ipmi_abort
|
|
|
6e5b62 |
+from pyanaconda.product import productName
|
|
|
6e5b62 |
from pyanaconda.simpleconfig import simple_replace
|
|
|
6e5b62 |
from functools import wraps
|
|
|
6e5b62 |
from urlgrabber.grabber import URLGrabber, URLGrabError
|
|
|
6e5b62 |
@@ -540,12 +541,16 @@ reposdir=%s
|
|
 |
05fef4 |
@property
|
|
|
05fef4 |
def mirrorEnabled(self):
|
|
|
05fef4 |
with _yum_lock:
|
|
|
6e5b62 |
- # yum initializes with plugins disabled, and when plugins are disabled
|
|
|
6e5b62 |
- # _yum.plugins is a DummyYumPlugins object, which has no useful attributes.
|
|
|
6e5b62 |
- if hasattr(self._yum.plugins, "_plugins"):
|
|
|
6e5b62 |
- return "fastestmirror" in self._yum.plugins._plugins
|
|
|
6e5b62 |
+ # we just skip this on CentOS since we cant support it yet
|
|
|
05fef4 |
+ if productName.startswith("CentOS"):
|
|
|
6e5b62 |
+ return False
|
|
|
6e5b62 |
else:
|
|
|
6e5b62 |
- return False
|
|
|
6e5b62 |
+ # yum initializes with plugins disabled, and when plugins are disabled
|
|
|
6e5b62 |
+ # _yum.plugins is a DummyYumPlugins object, which has no useful attributes.
|
|
|
6e5b62 |
+ if hasattr(self._yum.plugins, "_plugins"):
|
|
|
6e5b62 |
+ return "fastestmirror" in self._yum.plugins._plugins
|
|
|
6e5b62 |
+ else:
|
|
|
6e5b62 |
+ return False
|
|
|
05fef4 |
|
|
|
05fef4 |
def getRepo(self, repo_id):
|
|
|
6e5b62 |
"""Return the yum repo object."""
|