diff options
| author | Chris Lumens <clumens@redhat.com> | 2012-11-16 14:05:25 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2012-11-20 16:22:53 -0500 |
| commit | 4d16e77b70fad2a47bc5a4c3f73823c1b68bc281 (patch) | |
| tree | a9a762cc447a84cf32ea373ac21d786aef056296 /pyanaconda/packaging | |
| parent | 38968641f3481bde6509813115e26441e2f9f33b (diff) | |
| download | anaconda-4d16e77b70fad2a47bc5a4c3f73823c1b68bc281.tar.gz anaconda-4d16e77b70fad2a47bc5a4c3f73823c1b68bc281.tar.xz anaconda-4d16e77b70fad2a47bc5a4c3f73823c1b68bc281.zip | |
Allow specifying whether the URL you've given is a mirrorlist or not (#868558).
Diffstat (limited to 'pyanaconda/packaging')
| -rw-r--r-- | pyanaconda/packaging/yumpayload.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/pyanaconda/packaging/yumpayload.py b/pyanaconda/packaging/yumpayload.py index 65691105c..0c5ea8cca 100644 --- a/pyanaconda/packaging/yumpayload.py +++ b/pyanaconda/packaging/yumpayload.py @@ -569,6 +569,8 @@ reposdir=%s method = self.data.method sslverify = True url = None + mirrorlist = None + # See if we already have stuff mounted due to dracut isodev = get_mount_device(DRACUT_ISODIR) device = get_mount_device(DRACUT_REPODIR) @@ -657,6 +659,7 @@ reposdir=%s url = "file://" + path elif method.method == "url": url = method.url + mirrorlist = method.mirrorlist sslverify = not (method.noverifyssl or flags.noverifyssl) elif method.method == "cdrom" or (checkmount and not method.method): # Did dracut leave the DVD or NFS mounted for us? @@ -702,7 +705,7 @@ reposdir=%s self._yumCacheDirHack() try: - self._addYumRepo(BASE_REPO_NAME, url, + self._addYumRepo(BASE_REPO_NAME, url, mirrorlist=mirrorlist, proxyurl=method.proxy, sslverify=sslverify) except MetadataError as e: log.error("base repo (%s/%s) not valid -- removing it" |