summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2005-04-27 20:43:31 +0000
committerChris Lumens <clumens@redhat.com>2005-04-27 20:43:31 +0000
commit6eed410f6d4bbf8f85ba493fc7d49fbbec1aae09 (patch)
tree9d524cba1707e142e33f1c31c80c21a6ccca179c
parentd14c4b4a431e0b528cc0b3bdd72b6454c36bd04a (diff)
downloadanaconda-6eed410f6d4bbf8f85ba493fc7d49fbbec1aae09.tar.gz
anaconda-6eed410f6d4bbf8f85ba493fc7d49fbbec1aae09.tar.xz
anaconda-6eed410f6d4bbf8f85ba493fc7d49fbbec1aae09.zip
Set a default font for bterm and none, which only mean something to the
loader (#156052).
-rw-r--r--ChangeLog3
-rw-r--r--language.py8
2 files changed, 10 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 39d0519fa..421dc358a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,9 @@
* kickstart.py: Recognize --label for the part keyword (#79832).
* partRequests.py: Pass labels between kickstart and requests.
+ * language.py (Language.__init__): Set a default font for bterm and
+ none, which only mean something to the loader (#156052).
+
2005-04-27 Jeremy Katz <katzj@redhat.com>
* isys/isys.c (doDevSpaceFree): Apply Jindrich Novy's patch to fix
diff --git a/language.py b/language.py
index caf30f4b0..1930ad17f 100644
--- a/language.py
+++ b/language.py
@@ -86,7 +86,13 @@ class Language:
if len(l) < 6:
continue
- self.localeInfo[l[3]] = (l[0], l[1], l[2], l[4], string.strip(l[5]))
+ # "bterm" and "none" are only useful for loader.
+ if l[2] == "none" or l[2] == "bterm":
+ font = "latarcyrheb-sun16"
+ else:
+ font = l[2]
+
+ self.localeInfo[l[3]] = (l[0], l[1], font, l[4], string.strip(l[5]))
f.close()