diff options
author | Chris Lumens <clumens@redhat.com> | 2006-08-29 19:38:38 +0000 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2006-08-29 19:38:38 +0000 |
commit | 4bf9bad59d5aff7a5f54571892102f76cfd90df2 (patch) | |
tree | 68a88091790bf720401837e91d522b438ddbd6d5 | |
parent | 514d30a0798c3ae08c7bfdf1650c9f85e6229212 (diff) | |
download | anaconda-4bf9bad59d5aff7a5f54571892102f76cfd90df2.tar.gz anaconda-4bf9bad59d5aff7a5f54571892102f76cfd90df2.tar.xz anaconda-4bf9bad59d5aff7a5f54571892102f76cfd90df2.zip |
Display repo names, look up with repo ids.
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | iw/task_gui.py | 19 |
2 files changed, 11 insertions, 10 deletions
@@ -4,6 +4,8 @@ going backwards. doRepoSetup now takes a repo object instead of an id, so we can display the name, but lookup with the id. + * iw/task_gui.py: Display repo names, look up with repo ids. + 2006-08-29 David Cantrell <dcantrell@redhat.com> * loader2/net.c: Remember manual TCP/IP settings if user selects diff --git a/iw/task_gui.py b/iw/task_gui.py index 338db5edd..b4fbc1dfc 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -39,7 +39,7 @@ class TaskWindow(InstallWindow): map(self.backend.deselectGroup, grps) repos = self.xml.get_widget("repoList").get_model() - for (cb, repotxt, repo) in repos: + for (cb, reponame, repo) in repos: if cb: repo.enable() self._setupRepo(repo) @@ -67,9 +67,8 @@ class TaskWindow(InstallWindow): def _setupRepo(self, repo): try: - self.backend.doRepoSetup(self.anaconda, repo.id, - fatalerrors = False) - log.info("added repository %s with with source URL %s" % (repo.id, repo.baseurl[0])) + self.backend.doRepoSetup(self.anaconda, repo, fatalerrors = False) + log.info("added repository %s with with source URL %s" % (repo.name, repo.baseurl[0])) except yum.Errors.RepoError, e: self.intf.messageWindow(_("Error"), _("Unable to read package metadata from repository. " @@ -143,7 +142,7 @@ class TaskWindow(InstallWindow): continue s = self.xml.get_widget("repoList").get_model() - s.append([repo.isEnabled(), repo.id, repo]) + s.append([repo.isEnabled(), repo.name, repo]) break @@ -194,12 +193,12 @@ class TaskWindow(InstallWindow): col.set_clickable(False) tl.append_column(col) - for (repoid, uri) in self.repos.items(): - rid = repoid.replace(" ", "") - if not self.backend.ayum.repos.repos.has_key(rid): + for (reponame, uri) in self.repos.items(): + repoid = reponame.replace(" ", "") + if not self.backend.ayum.repos.repos.has_key(repoid): continue - repo = self.backend.ayum.repos.repos[rid] - store.append([repo.isEnabled(), repoid, repo]) + repo = self.backend.ayum.repos.repos[repoid] + store.append([repo.isEnabled(), repo.name, repo]) def getScreen (self, anaconda): |