You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
34 lines
1.5 KiB
34 lines
1.5 KiB
7 years ago
|
--- yum-utils-1.1.31/yum-config-manager.py.orig 2016-02-04 13:54:28.339084020 +0100
|
||
|
|
+++ yum-utils-1.1.31/yum-config-manager.py 2016-02-04 13:55:02.427900621 +0100
|
||
|
|
@@ -10,6 +10,8 @@
|
||
|
|
import fnmatch
|
||
|
|
|
||
|
|
from iniparse import INIConfig
|
||
|
|
+import yum.config
|
||
|
|
+import yum.yumRepo
|
||
|
|
|
||
|
|
from yum.parser import varReplace
|
||
|
|
|
||
|
|
@@ -209,13 +211,16 @@
|
||
|
|
if url.endswith('.repo'): # this is a .repo file - fetch it, put it in our reposdir and enable it
|
||
|
|
destname = os.path.basename(url)
|
||
|
|
destname = myrepodir + '/' + destname
|
||
|
|
- # this sucks - but take the first repo we come to that's enabled
|
||
|
|
- # and steal it's grabber object - it could be proxy-laden but that's the risk we take
|
||
|
|
- # grumbledy grumble
|
||
|
|
- grabber = yb.repos.listEnabled()[0].grabfunc
|
||
|
|
+
|
||
|
|
+ # dummy grabfunc, using [main] options
|
||
|
|
+ repo = yum.yumRepo.YumRepository('dummy')
|
||
|
|
+ repo.baseurl = ['http://dummy']
|
||
|
|
+ repo.populate(yum.config.ConfigParser(), None, yb.conf)
|
||
|
|
+ grabber = repo.grabfunc; del repo
|
||
|
|
+
|
||
|
|
print 'grabbing file %s to %s' % (url, destname)
|
||
|
|
try:
|
||
|
|
- result = grabber.urlgrab(url, filename=destname, copy_local=True)
|
||
|
|
+ result = grabber.urlgrab(url, filename=destname, copy_local=True, reget=None)
|
||
|
|
except (IOError, OSError, yum.Errors.YumBaseError), e:
|
||
|
|
logger.error('Could not fetch/save url %s to file %s: %s' % (url, destname, e))
|
||
|
|
continue
|