summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2007-05-17 17:15:39 +0000
committerJeremy Katz <katzj@redhat.com>2007-05-17 17:15:39 +0000
commit887a8c3f1f3634d793d68aa4dfa5e24cf2d1b819 (patch)
tree2ef2532d4c4f0a7ce5cd3d313a7e10218f5eb8a1
parent93107f25c28c3afc2c9a1ac28b65026c32dddb0f (diff)
downloadanaconda-887a8c3f1f3634d793d68aa4dfa5e24cf2d1b819.tar.gz
anaconda-887a8c3f1f3634d793d68aa4dfa5e24cf2d1b819.tar.xz
anaconda-887a8c3f1f3634d793d68aa4dfa5e24cf2d1b819.zip
2007-05-17 Jeremy Katz <katzj@redhat.com>
* upgrade.py (upgrade_remove_blacklist): Add esound to the list
-rw-r--r--ChangeLog4
-rw-r--r--upgrade.py4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d387c4002..ebc5d820a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-17 Jeremy Katz <katzj@redhat.com>
+
+ * upgrade.py (upgrade_remove_blacklist): Add esound to the list
+
2007-05-16 Chris Lumens <clumens@redhat.com>
* anaconda.spec: Bump version.
diff --git a/upgrade.py b/upgrade.py
index 2da1bc062..9e430dd16 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")] )
+ upgrade_remove_blacklist.extend( [("perl","i386"), ("e2fsprogs", "i386"), ("hal", "i386"), ("mysql", "i386"), ("esound", "i386")] )
if rhpl.getArch() == "ppc":
- upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64")] )
+ upgrade_remove_blacklist.extend( [("e2fsprogs", "ppc64"), ("hal", "ppc64"), ("mysql", "ppc64"), ("esound", "ppc64")] )
def queryUpgradeContinue(anaconda):
if anaconda.dir == DISPATCH_FORWARD: