summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2007-03-22 17:43:09 +0000
committerChris Lumens <clumens@redhat.com>2007-03-22 17:43:09 +0000
commitc509a19bd67aaa20969fa93c73b13bc23c10e394 (patch)
tree5adf169640c372b42d5bebdc64130cd528c942c2
parentef4de7d3c5a4029521eb4d290e8a2ffe9633f5ce (diff)
downloadanaconda-c509a19bd67aaa20969fa93c73b13bc23c10e394.tar.gz
anaconda-c509a19bd67aaa20969fa93c73b13bc23c10e394.tar.xz
anaconda-c509a19bd67aaa20969fa93c73b13bc23c10e394.zip
Allow upgrades from Fedora Core to Fedora.
-rw-r--r--ChangeLog3
-rw-r--r--partedUtils.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 06d1b8a4e..d95662e1d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
* kickstart.py (Timezone): Inherit from FC6_Timezone to make the
--isUtc option work.
+ * partedUtils.py (productMatches): Allow upgrades from Fedora Core to
+ Fedora.
+
* yuminstall.py: Remove a couple FIXMEs for things that are now in
yum.
diff --git a/partedUtils.py b/partedUtils.py
index 0d5d51e3a..0dffc60b0 100644
--- a/partedUtils.py
+++ b/partedUtils.py
@@ -549,7 +549,8 @@ def productMatches(oldproduct, newproduct):
"Red Hat Enterprise Linux Client": ("Red Hat Enterprise Linux WS",
"Red Hat Enterprise Linux Desktop",
"Red Hat Enterprise Linux"),
- "Fedora Core": ("Red Hat Linux",)
+ "Fedora Core": ("Red Hat Linux",),
+ "Fedora": ("Fedora Core",)
}
if productUpgrades.has_key(newproduct):