summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2007-05-22 18:19:21 +0000
committerJeremy Katz <katzj@redhat.com>2007-05-22 18:19:21 +0000
commit75dc025c91689216670fa301971356f29c531982 (patch)
tree8837837bed76d1cb885535e2510d0aa8cfe52b72
parent9016fb476963e03a006f830510822b57f20fb141 (diff)
downloadanaconda-75dc025c91689216670fa301971356f29c531982.tar.gz
anaconda-75dc025c91689216670fa301971356f29c531982.tar.xz
anaconda-75dc025c91689216670fa301971356f29c531982.zip
2007-05-22 Jeremy Katz <katzj@redhat.com>
* upgrade.py: More blacklist
-rw-r--r--ChangeLog2
-rw-r--r--upgrade.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index bd86217c0..6c7177c1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-05-22 Jeremy Katz <katzj@redhat.com>
+ * upgrade.py: More blacklist
+
* scripts/getlangnames.py: Fix for unicode shenanigans
2007-05-22 David Cantrell <dcantrell@redhat.com>
diff --git a/upgrade.py b/upgrade.py
index 9e430dd16..64583014a 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -40,10 +40,10 @@ log = logging.getLogger("anaconda")
upgrade_remove_blacklist = [("system-config-mouse",), ("dev",)]
if rhpl.getArch() == "x86_64":
- upgrade_remove_blacklist.extend( [("perl","i386"), ("e2fsprogs", "i386"), ("hal", "i386"), ("mysql", "i386"), ("esound", "i386")] )
+ upgrade_remove_blacklist.extend( [("perl","i386"), ("e2fsprogs", "i386"), ("hal", "i386"), ("mysql", "i386"), ("esound", "i386"), ("mkinitrd", "i386")] )
if rhpl.getArch() == "ppc":
- upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64"), ("esound", "ppc64")] )
+ upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64"), ("esound", "ppc64"), ("mkinitrd", "ppc64")] )
def queryUpgradeContinue(anaconda):
if anaconda.dir == DISPATCH_FORWARD: