diff options
| author | Paul Nasrat <pnasrat@redhat.com> | 2005-04-07 14:04:37 +0000 |
|---|---|---|
| committer | Paul Nasrat <pnasrat@redhat.com> | 2005-04-07 14:04:37 +0000 |
| commit | 1d64faa6a3b0aa398c5320eb54b79627d72a5e14 (patch) | |
| tree | 1a7f6aa7cd85c706a8deac27773de4af481484c4 /kickstart.py | |
| parent | ea268a9a5c8eeb55c53a0849673d273ca4c79fe0 (diff) | |
| download | anaconda-1d64faa6a3b0aa398c5320eb54b79627d72a5e14.tar.gz anaconda-1d64faa6a3b0aa398c5320eb54b79627d72a5e14.tar.xz anaconda-1d64faa6a3b0aa398c5320eb54b79627d72a5e14.zip | |
Fix handling of name.arch - based on patch from Michael E Brown via mdomsch
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 36 |
1 files changed, 22 insertions, 14 deletions
diff --git a/kickstart.py b/kickstart.py index 00b77c7dc..ed6587145 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1472,31 +1472,39 @@ class KickstartBase(BaseInstallClass): fields = n.split(".") name = string.join(fields[:-1], ".") arch = fields[-1] + found = 0 if hdlist.pkgnames.has_key(name): pkgs = hdlist.pkgnames[name] for (nevra, parch) in pkgs: if parch == arch: hdlist.pkgs[nevra].select() + found = 0 continue + if found: + continue if hdlist.has_key(n): hdlist[n].select() - elif self.handleMissing == KS_MISSING_IGNORE: + continue + + if self.handleMissing == KS_MISSING_IGNORE: log("package %s doesn't exist, ignoring" %(n,)) + continue + + + rc = intf.messageWindow(_("Missing Package"), + _("You have specified that the " + "package '%s' should be installed. " + "This package does not exist. " + "Would you like to continue or " + "abort your installation?") %(n,), + type="custom", + custom_buttons=[_("_Abort"), + _("_Continue")]) + if rc == 0: + sys.exit(1) else: - rc = intf.messageWindow(_("Missing Package"), - _("You have specified that the " - "package '%s' should be installed. " - "This package does not exist. " - "Would you like to continue or " - "abort your installation?") %(n,), - type="custom", - custom_buttons=[_("_Abort"), - _("_Continue")]) - if rc == 0: - sys.exit(1) - else: - pass + pass def setGroupSelection(self, grpset, intf): |