diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-08-20 23:54:51 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-08-20 23:54:51 +0000 |
| commit | dd8951f2026a93111f29b1d6d670e622db1951e3 (patch) | |
| tree | 795f40e92150953edb8b5db5a1dab0436f875bd7 /textw | |
| parent | 3960c2c5b13e4e11d54a6d85c33e5675a284a794 (diff) | |
| download | anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.tar.gz anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.tar.xz anaconda-dd8951f2026a93111f29b1d6d670e622db1951e3.zip | |
merge changes from taroon branch
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/packages_text.py | 9 | ||||
| -rw-r--r-- | textw/xconfig_text.py | 8 |
2 files changed, 10 insertions, 7 deletions
diff --git a/textw/packages_text.py b/textw/packages_text.py index dda079b54..a5c532d90 100644 --- a/textw/packages_text.py +++ b/textw/packages_text.py @@ -103,7 +103,14 @@ class PackageGroupWindow: pkgselection[k] = origpkgselection[k] for pkg in origpkgselection.keys(): - gct.append(pkg, pkg, pkgselection[pkg][1]) + if grpset.hdrlist.pkgs.has_key(pkg): + name = grpset.hdrlist.pkgs[pkg].name + elif grpset.groups.has_key(pkg): + name = grpset.groups[pkg].name + else: + log("unknown package %s" %(pkg,)) + continue + gct.append(name, pkg, pkgselection[pkg][1]) bb2 = ButtonBar (screen, (TEXT_OK_BUTTON, TEXT_CANCEL_BUTTON)) diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py index d8f79d427..b28c6453e 100644 --- a/textw/xconfig_text.py +++ b/textw/xconfig_text.py @@ -626,8 +626,7 @@ class XConfigWindowCard: skipx = 0 while 1: bb = ButtonBar (screen, (TEXT_OK_BUTTON, - (_("Skip X Configuration"), "skipx"), - TEXT_BACK_BUTTON)) + (_("Skip X Configuration"), "skipx"))) toplevel = GridFormHelp (screen, _("Video Card Configuration"), "videocard", 1, 5) @@ -678,10 +677,7 @@ class XConfigWindowCard: result = toplevel.run () rc = bb.buttonPressed (result) - if rc == TEXT_BACK_CHECK: - screen.popWindow() - return INSTALL_BACK - elif rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK: + if rc == TEXT_OK_CHECK or result == TEXT_F12_CHECK: # we're done # see if they have not specified card yet if self.selectedCard == None: |