diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | kickstart.py | 14 |
2 files changed, 16 insertions, 1 deletions
@@ -1,5 +1,8 @@ 2004-10-04 Jeremy Katz <katzj@redhat.com> + * kickstart.py (KickstartBase.setPackageSelection): Fix a thinko + in the arch-specific case. Also, add arch-specific removal (#133396) + * lang-table: Fix Polish (#134554) * dispatch.py (installSteps): diff --git a/kickstart.py b/kickstart.py index ab3eaa957..714e08766 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1450,7 +1450,7 @@ class KickstartBase(BaseInstallClass): for (nevra, parch) in pkgs: if parch == arch: hdlist.pkgs[nevra].select() - break + continue if hdlist.has_key(n): hdlist[n].select() @@ -1500,6 +1500,18 @@ class KickstartBase(BaseInstallClass): pass for n in self.excludedList: + # allow arch:name syntax + if n.find("."): + fields = n.split(".") + name = string.join(fields[:-1], ".") + arch = fields[-1] + if grpset.hdrlist.pkgnames.has_key(name): + pkgs = grpset.hdrlist.pkgnames[name] + for (nevra, parch) in pkgs: + if parch == arch: + grpset.hdrlist.pkgs[nevra].unselect(isManual = 1) + continue + if grpset.hdrlist.has_key(n): grpset.hdrlist[n].unselect(isManual = 1) else: |