1 |
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py |
diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py |
2 |
--- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py 2015-10-29 14:23:19.000000000 +0000 |
--- anaconda-21.48.22.121.orig/pyananconda/packaging/yumpayload.py 2017-08-31 16:28:06.672265889 +0000 |
3 |
+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2015-12-07 17:36:49.070000000 +0000 |
+++ anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py 2017-08-31 16:28:38.812826778 +0000 |
4 |
@@ -481,12 +481,16 @@ |
@@ -42,6 +42,7 @@ import time |
5 |
|
import hashlib |
6 |
|
from pyanaconda.packaging import SSLOptions |
7 |
|
from pyanaconda.iutil import execReadlines, ipmi_abort |
8 |
|
+from pyanaconda.product import productName |
9 |
|
from pyanaconda.simpleconfig import simple_replace |
10 |
|
from functools import wraps |
11 |
|
from urlgrabber.grabber import URLGrabber, URLGrabError |
12 |
|
@@ -540,12 +541,16 @@ reposdir=%s |
13 |
@property |
@property |
14 |
def mirrorEnabled(self): |
def mirrorEnabled(self): |
15 |
with _yum_lock: |
with _yum_lock: |
30 |
+ return False |
+ return False |
31 |
|
|
32 |
def getRepo(self, repo_id): |
def getRepo(self, repo_id): |
33 |
""" Return the yum repo object. """ |
"""Return the yum repo object.""" |
|
diff -uNr anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py |
|
|
--- anaconda-21.48.22.56__orig/pyanaconda/packaging/yumpayload.py 2015-12-07 21:29:36.058347960 +0000 |
|
|
+++ anaconda-21.48.22.56/pyanaconda/packaging/yumpayload.py 2015-12-07 21:32:50.255770594 +0000 |
|
|
@@ -43,6 +43,7 @@ |
|
|
from pyanaconda.iutil import execReadlines |
|
|
from pyanaconda.simpleconfig import simple_replace |
|
|
from functools import wraps |
|
|
+from pyanaconda.product import productName |
|
|
|
|
|
import logging |
|
|
log = logging.getLogger("packaging") |
|