From 96d5311f8d8e48aaef3d148404de7bbcf4f0d5ef Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Aug 31 2017 20:34:26 +0000 Subject: add 'import productName' for yumpayload.py --- diff --git a/SOURCES/anaconda-centos-disable-mirrors.patch b/SOURCES/anaconda-centos-disable-mirrors.patch index a8d1d39..f0d58ae 100644 --- a/SOURCES/anaconda-centos-disable-mirrors.patch +++ b/SOURCES/anaconda-centos-disable-mirrors.patch @@ -1,7 +1,15 @@ diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py ---- anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py 2017-08-23 02:04:02.304040176 +0000 -+++ anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py 2017-08-23 02:12:02.749029047 +0000 -@@ -518,12 +518,16 @@ reposdir=%s +--- anaconda-21.48.22.121.orig/pyananconda/packaging/yumpayload.py 2017-08-31 16:28:06.672265889 +0000 ++++ anaconda-21.48.22.121/pyanaconda/packaging/yumpayload.py 2017-08-31 16:28:38.812826778 +0000 +@@ -41,6 +41,7 @@ import sys + import time + import hashlib + from pyanaconda.iutil import execReadlines, ipmi_abort ++from pyanaconda.product import productName + from pyanaconda.simpleconfig import simple_replace + from functools import wraps + from urlgrabber.grabber import URLGrabber, URLGrabError +@@ -519,12 +519,16 @@ reposdir=%s @property def mirrorEnabled(self): with _yum_lock: @@ -20,6 +28,6 @@ diff -uNrp anaconda-21.48.22.121.orig/pyanaconda/packaging/yumpayload.py anacond + return "fastestmirror" in self._yum.plugins._plugins + else: + return False - + def getRepo(self, repo_id): """Return the yum repo object."""