imgcreate/creator.py | 3 ++-
imgcreate/kickstart.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
New commits:
commit c363cdbbe68a905a02e8a5a5fe385a82ce91f1f2
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Fri Jun 21 17:50:08 2013 -0700
Add repo --noverifyssl support (#907707)
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 64cd188..42faf6f 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -627,7 +627,7 @@ class ImageCreator(object):
ayum.setup(yum_conf, self._instroot, cacheonly=self.cacheonly)
for repo in kickstart.get_repos(self.ks, repo_urls):
- (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo
+ (name, baseurl, mirrorlist, proxy, inc, exc, cost, sslverify) = repo
yr = ayum.addRepository(name, baseurl, mirrorlist)
if inc:
@@ -638,6 +638,7 @@ class ImageCreator(object):
yr.proxy = proxy
if cost is not None:
yr.cost = cost
+ yr.sslverify = sslverify
ayum.setup(yum_conf, self._instroot)
if kickstart.exclude_docs(self.ks):
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 20f2df6..1059801 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -543,6 +543,7 @@ def get_repos(ks, repo_urls = {}):
baseurl = repo.baseurl
mirrorlist = repo.mirrorlist
proxy = repo.proxy
+ sslverify = not repo.noverifyssl
if repo.name in repo_urls:
baseurl = repo_urls[repo.name]
@@ -550,7 +551,7 @@ def get_repos(ks, repo_urls = {}):
if repos.has_key(repo.name):
logging.warn("Overriding already specified repo %s" %(repo.name,))
- repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost)
+ repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost, sslverify)
return repos.values()