diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-10-22 20:27:30 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-10-22 20:27:30 +0000 |
| commit | e0ab6dadf01fd976b368c180c18f499ab3d72171 (patch) | |
| tree | 9351d3a693d4858afc79f1324cdd41fae21e8907 | |
| parent | 4543fd44f15a204b342336fe2947ce66030ca327 (diff) | |
| download | anaconda-e0ab6dadf01fd976b368c180c18f499ab3d72171.tar.gz anaconda-e0ab6dadf01fd976b368c180c18f499ab3d72171.tar.xz anaconda-e0ab6dadf01fd976b368c180c18f499ab3d72171.zip | |
2007-10-22 Jeremy Katz <katzj@redhat.com>
* upgrade.py: Add some kde packages to the list that we remove on
upgrade (#339981). Also clean up to have a little less duplication.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | upgrade.py | 12 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2007-10-22 Jeremy Katz <katzj@redhat.com> + + * upgrade.py: Add some kde packages to the list that we remove on + upgrade (#339981). Also clean up to have a little less duplication. + 2007-10-22 Peter Jones <pjones@redhat.com> * loader2/cdinstall.c: get rid of sdupprintf() calls diff --git a/upgrade.py b/upgrade.py index a7122fae9..ff71bec12 100644 --- a/upgrade.py +++ b/upgrade.py @@ -40,11 +40,17 @@ log = logging.getLogger("anaconda") # (name, ) to erase all matches upgrade_remove_blacklist = [("system-config-mouse",), ("dev",)] +# list of things which have been split and thus need to have their +# multilib package removed. the new -libs package will then get pulled in +# automatically by dependencies +splitpkgs = ("e2fsprogs", "hal", "mysql", "esound", "mkinitrd", "dbus", "kdeaccessibility", "kdebase", "kdeedu", "kdegraphics", "kdemultimedia", "kdemultimedia-extras","kdenetwork", "kdesdk", "kdeutils", "kdewebdev") if rhpl.getArch() == "x86_64": - upgrade_remove_blacklist.extend( [("perl","i386"), ("e2fsprogs", "i386"), ("hal", "i386"), ("mysql", "i386"), ("esound", "i386"), ("mkinitrd", "i386"), ("dbus.i386")] ) - + upgrade_remove_blacklist.extend(map(lambda x: (x, "i386"), splitpkgs)) if rhpl.getArch() == "ppc": - upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64"), ("esound", "ppc64"), ("mkinitrd", "ppc64"), ("dbus", "ppc64")] ) + upgrade_remove_blacklist.extend(map(lambda x: (x, "ppc64"), splitpkgs)) + +if rhpl.getArch() == "x86_64": + upgrade_remove_blacklist.extend( [("perl","i386")] ) def queryUpgradeContinue(anaconda): if anaconda.dir == DISPATCH_FORWARD: |