summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Nasrat <pnasrat@redhat.com>2006-11-01 09:33:43 +0000
committerPaul Nasrat <pnasrat@redhat.com>2006-11-01 09:33:43 +0000
commit35e9fbc73b9e19aebd4a2276962c0a7bd6ea5bac (patch)
treee8b856d6394c5dc21f1aca5dd9e88e09c74f6fd2
parent58c9b1f4271274352816dfbecc5c234aa24bdee7 (diff)
downloadanaconda-35e9fbc73b9e19aebd4a2276962c0a7bd6ea5bac.tar.gz
anaconda-35e9fbc73b9e19aebd4a2276962c0a7bd6ea5bac.tar.xz
anaconda-35e9fbc73b9e19aebd4a2276962c0a7bd6ea5bac.zip
Fix text based install selection of languages as they are only set in LANG if
we can display them (#212511)
-rw-r--r--ChangeLog10
-rw-r--r--backend.py2
-rw-r--r--installclasses/fedora.py2
-rw-r--r--installclasses/rhel.py2
-rw-r--r--yuminstall.py5
5 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f6f216165..e32e3306e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-10-01 Paul Nasrat <pnasrat@redhat.com>
+
+ * backend.py (AnacondaBackend.getDefaultGroups): Signature change to
+ take an anaconda
+ * yuminstall.py (YumBackend.getDefaultGroups): Get the language list
+ from install data to fix text mode (#212511)
+ * installclasses/fedora.py (InstallClass.setGroupSelection): Pass
+ anaconda object to getDefaultGroups
+ * installclasses/rhel.py (InstallClass.setGroupSelection): ditto
+
2006-10-31 Chris Lumens <clumens@redhat.com>
* loader2/kickstart.c (getHostandPath): The slash should be the first
diff --git a/backend.py b/backend.py
index 5e6e0e891..3ca6bd034 100644
--- a/backend.py
+++ b/backend.py
@@ -132,7 +132,7 @@ class AnacondaBackend:
log.warning("deselectPackage not implemented for backend!")
pass
- def getDefaultGroups(self):
+ def getDefaultGroups(self, anaconda):
log.warning("getDefaultGroups not implemented for backend!")
pass
diff --git a/installclasses/fedora.py b/installclasses/fedora.py
index 023d2c932..1ed820ff0 100644
--- a/installclasses/fedora.py
+++ b/installclasses/fedora.py
@@ -34,7 +34,7 @@ class InstallClass(BaseInstallClass):
CLEARPART_TYPE_LINUX)
def setGroupSelection(self, anaconda):
- grps = anaconda.backend.getDefaultGroups()
+ grps = anaconda.backend.getDefaultGroups(anaconda)
map(lambda x: anaconda.backend.selectGroup(x), grps)
def setSteps(self, dispatch):
diff --git a/installclasses/rhel.py b/installclasses/rhel.py
index bd6fbb929..411382299 100644
--- a/installclasses/rhel.py
+++ b/installclasses/rhel.py
@@ -33,7 +33,7 @@ class InstallClass(BaseInstallClass):
CLEARPART_TYPE_LINUX)
def setGroupSelection(self, anaconda):
- grps = anaconda.backend.getDefaultGroups()
+ grps = anaconda.backend.getDefaultGroups(anaconda)
map(lambda x: anaconda.backend.selectGroup(x), grps)
def setSteps(self, dispatch):
diff --git a/yuminstall.py b/yuminstall.py
index a5dff2c26..587f5ee3c 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -881,11 +881,10 @@ class YumBackend(AnacondaBackend):
c.categoryid = "uncategorized"
self.ayum.comps._categories[c.categoryid] = c
- def getDefaultGroups(self):
- import language
+ def getDefaultGroups(self, anaconda):
+ langs = anaconda.id.instLanguage.getCurrentLangSearchList()
rc = map(lambda x: x.groupid,
filter(lambda x: x.default, self.ayum.comps.groups))
- langs = language.expandLangs(os.environ["LANG"])
for g in self.ayum.comps.groups:
if g.langonly in langs:
rc.append(g.groupid)