[Fedora-livecd-list] imgcreate/creator.py imgcreate/kickstart.py tools/edit-livecd

imgcreate/creator.py | 4 +++- imgcreate/kickstart.py | 2 +- tools/edit-livecd | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) New commits: commit afea60cdbe85a9e770d8fc7bf3fd8b1ffb4d743a Author: Mads Kiilerich <mads(a)kiilerich.com&gt; Date: Mon Apr 16 16:44:33 2012 -0700 add support for cost in kickstart repo line (#735079) repo --cost is useful in overriding the default repo's packages. Signed-off-by: Brian C. Lane <bcl(a)redhat.com&gt; diff --git a/imgcreate/creator.py b/imgcreate/creator.py index e09bdcf..35fe777 100644 --- a/imgcreate/creator.py +++ b/imgcreate/creator.py @@ -621,7 +621,7 @@ class ImageCreator(object): ayum.setup(yum_conf, self._instroot) for repo in kickstart.get_repos(self.ks, repo_urls): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo yr = ayum.addRepository(name, baseurl, mirrorlist) if inc: @@ -630,6 +630,8 @@ class ImageCreator(object): yr.exclude = exc if proxy: yr.proxy = proxy + if cost is not None: + yr.cost = cost if kickstart.exclude_docs(self.ks): rpm.addMacro("_excludedocs", "1") diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py index 9fdd683..ad69a87 100644 --- a/imgcreate/kickstart.py +++ b/imgcreate/kickstart.py @@ -511,7 +511,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) + repos[repo.name] = (repo.name, baseurl, mirrorlist, proxy, inc, exc, repo.cost) return repos.values() diff --git a/tools/edit-livecd b/tools/edit-livecd index 948064b..bb59c7f 100755 --- a/tools/edit-livecd +++ b/tools/edit-livecd @@ -524,7 +524,7 @@ class LiveImageEditor(LiveImageCreator): # start RPM transaction ts=rpm.TransactionSet(self._instroot) for repo in kickstart.get_repos(self.ks): - (name, baseurl, mirrorlist, proxy, inc, exc) = repo + (name, baseurl, mirrorlist, proxy, inc, exc, cost) = repo if baseurl.startswith("file://"): baseurl=baseurl[7:] elif not baseurl.startswith("/"):