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