summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2006-09-20 18:54:40 +0000
committerChris Lumens <clumens@redhat.com>2006-09-20 18:54:40 +0000
commit95ed6e328b3dd11014b1d6eecf819a23c6d32dd3 (patch)
tree831a6c10bc596fa619c1254f81efce0d878ae496
parenteb8f437dfb918032bb1b91036d76ed1afcdd1a67 (diff)
downloadanaconda-95ed6e328b3dd11014b1d6eecf819a23c6d32dd3.tar.gz
anaconda-95ed6e328b3dd11014b1d6eecf819a23c6d32dd3.tar.xz
anaconda-95ed6e328b3dd11014b1d6eecf819a23c6d32dd3.zip
Don't write out "none" for SYSFONT.
-rw-r--r--ChangeLog5
-rw-r--r--language.py6
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6a57fecb0..109e2bac6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-20 Chris Lumens <clumens@redhat.com>
+
+ * language.py (Language.setDefault): Don't write out "none" for
+ SYSFONT.
+
2006-09-20 Jeremy Katz <katzj@redhat.com>
* syslogd.py (InstSyslog.start): Only exec syslogd if it exists
diff --git a/language.py b/language.py
index 450fd0d58..ca2989e7c 100644
--- a/language.py
+++ b/language.py
@@ -174,7 +174,11 @@ class Language:
dispLang = self.fixLang(self.canonLangNick(nick))
self.info['LANG'] = dispLang
- self.info['SYSFONT'] = self.localeInfo[dispLang][2]
+
+ if self.localeInfo[dispLang][2] == "none":
+ self.info['SYSFONT'] = None
+ else:
+ self.info['SYSFONT'] = self.localeInfo[dispLang][2]
# XXX hack - because of exceptional cases on the var - zh_CN.GB2312
if nick == "zh_CN.GB18030":