diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-05-23 15:23:26 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-05-23 15:23:26 +0000 |
| commit | 2370b8457724a1ba54f49af44d0ea138dd402371 (patch) | |
| tree | 1614b1b74d11c00d212ac2e3ad03cdee8587ec96 | |
| parent | c18168374d138377e38bd0bdeb7d48561881cd76 (diff) | |
| download | anaconda-2370b8457724a1ba54f49af44d0ea138dd402371.tar.gz anaconda-2370b8457724a1ba54f49af44d0ea138dd402371.tar.xz anaconda-2370b8457724a1ba54f49af44d0ea138dd402371.zip | |
2005-05-23 Jeremy Katz <katzj@redhat.com>
* kickstart.py (Kickstart.setGroupSelection): Allow excluding
packages based on arch (Dave Lehman, #158370)
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | kickstart.py | 12 |
2 files changed, 12 insertions, 3 deletions
@@ -1,5 +1,8 @@ 2005-05-23 Jeremy Katz <katzj@redhat.com> + * kickstart.py (Kickstart.setGroupSelection): Allow excluding + packages based on arch (Dave Lehman, #158370) + * loader2/net.c: Don't spew an error if you don't set the wepkey or essid (#158223) diff --git a/kickstart.py b/kickstart.py index 0249569c1..f7e692192 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1483,7 +1483,7 @@ class Kickstart(BaseInstallClass): if parch == arch: hdlist.pkgs[nevra].select() found = 1 - continue + break if found: continue @@ -1546,13 +1546,19 @@ class Kickstart(BaseInstallClass): arch = fields[-1] if grpset.hdrlist.pkgnames.has_key(name): pkgs = grpset.hdrlist.pkgnames[name] + found = 0 for (nevra, parch) in pkgs: if parch == arch: grpset.hdrlist.pkgs[nevra].unselect(isManual = 1) - continue + found = 1 + break + if found: + continue if grpset.hdrlist.has_key(n): - grpset.hdrlist[n].unselect(isManual = 1) + pkgs = grpset.hdrlist.pkgnames[name] + for (nevra, parch) in pkgs: + grpset.hdrlist.pkgs[nevra].unselect(isManual = 1) else: log("%s does not exist, can't exclude" %(n,)) |