[Fedora-livecd-list] [PATCH] Add proxy support to livecd-creator (#649546)

[Brian C. Lane]

This changes the previous return value for kickstart.get_repos to add
the proxy info.
---
 imgcreate/creator.py   |    6 ++++--
 imgcreate/kickstart.py |    5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 20be148..1f1e5b8 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -638,13 +638,15 @@ class ImageCreator(object):
         ayum.setup(yum_conf, self._instroot)
 
         for repo in kickstart.get_repos(self.ks, repo_urls):
-            (name, baseurl, mirrorlist, inc, exc) = repo
-            
+            (name, baseurl, mirrorlist, proxy, inc, exc) = repo
+
             yr = ayum.addRepository(name, baseurl, mirrorlist)
             if inc:
                 yr.includepkgs = inc
             if exc:
                 yr.exclude = exc
+            if proxy:
+                yr.proxy = proxy
 
         if kickstart.exclude_docs(self.ks):
             rpm.addMacro("_excludedocs", "1")
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 9a2145a..33859d6 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -502,14 +502,15 @@ def get_repos(ks, repo_urls = {}):
 
         baseurl = repo.baseurl
         mirrorlist = repo.mirrorlist
-        
+        proxy = repo.proxy
+
         if repo.name in repo_urls:
             baseurl = repo_urls[repo.name]
             mirrorlist = None
 
         if repos.has_key(repo.name):
             logging.warn("Overriding already specified repo %s" %(repo.name,))
-        repos[repo.name] = (repo.name, baseurl, mirrorlist, inc, exc)
+        repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc)
 
     return repos.values()
 
-- 
1.7.3.2