summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2005-05-04 19:05:08 +0000
committerChris Lumens <clumens@redhat.com>2005-05-04 19:05:08 +0000
commite4a581c69619675225a4047943e55ffa11767001 (patch)
treeecbc0b05adce8483d277c0171e4c94c8bf76ac4f
parent86379193e2cfed78c23f38d568da40c8f34e2068 (diff)
downloadanaconda-e4a581c69619675225a4047943e55ffa11767001.tar.gz
anaconda-e4a581c69619675225a4047943e55ffa11767001.tar.xz
anaconda-e4a581c69619675225a4047943e55ffa11767001.zip
Unselect the language support group if no languages besides en_US are
supported.
-rw-r--r--ChangeLog5
-rw-r--r--packages.py6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 560d79c20..7a3fb59fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-04 Chris Lumens <clumens@redhat.com>
+
+ * packages.py (selectLanguageSupportGroups): Unselect the language
+ support group if no languages besides en_US are supported.
+
2005-05-03 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/packages.py b/packages.py
index 2a880f920..4440a21dc 100644
--- a/packages.py
+++ b/packages.py
@@ -1569,6 +1569,7 @@ def betaNagScreen(intf, dir):
# FIXME: this is a kind of poor way to do this, but it will work for now
def selectLanguageSupportGroups(grpset, instLanguage):
+ anySelected = False
if not grpset.groups.has_key("language-support"):
return
@@ -1598,5 +1599,10 @@ def selectLanguageSupportGroups(grpset, instLanguage):
grpset.hdrlist[req].addDeps([package], main = 0)
if grpset.hdrlist[req].isSelected():
grpset.hdrlist[package].select()
+ anySelected = True
grpset.hdrlist[package].usecount += grpset.hdrlist[req].usecount - 1
group.selectDeps([package], uses = grpset.hdrlist[req].usecount)
+
+ # If no language support packages are selected, unselect the group too.
+ if not anySelected:
+ grpset.groups["language-support"].unselect()