anaconda/sme8/0008-Search-for-language-updates-on-upgrade-disk.patch

From 118a68b871b7b1860ed79c8d840fff04fc75fa38 Mon Sep 17 00:00:00 2001
From: Shad L. Lords <slords@mail.com>
Date: Mon, 19 Oct 2009 08:17:39 -0600
Subject: [PATCH 08/17] Search for language updates on upgrade disk

---
 language.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/language.py b/language.py
index cc14aeb..7a042b7 100644
--- a/language.py
+++ b/language.py
@@ -57,7 +57,9 @@ class Language:
             self.current = "en_US.UTF-8"
 
         # English name -> native name mapping
-        search = ('lang-names', '/usr/lib/anaconda/lang-names')
+        search = ('lang-names', '/tmp/updates/lang-names',
+                  '/mnt/source/RHupdates/lang-names',
+                  '/usr/lib/anaconda/lang-names')
         for path in search:
             if os.access(path, os.R_OK):
                 f = open(path, 'r')
@@ -109,6 +111,8 @@ class Language:
 
     def getNickByName (self, name):
         for k in self.localeInfo.keys():
+            if k == 'C':
+                continue
             row = self.localeInfo[k]
             if row[0] == name:
                 return k
-- 
1.7.1

1	slords	1.5	From 118a68b871b7b1860ed79c8d840fff04fc75fa38 Mon Sep 17 00:00:00 2001
2	slords	1.1	From: Shad L. Lords <slords@mail.com>
3			Date: Mon, 19 Oct 2009 08:17:39 -0600
4	slords	1.5	Subject: [PATCH 08/17] Search for language updates on upgrade disk
5	slords	1.1
6			---
7			language.py \| 6 +++++-
8			1 files changed, 5 insertions(+), 1 deletions(-)
9
10			diff --git a/language.py b/language.py
11			index cc14aeb..7a042b7 100644
12			--- a/language.py
13			+++ b/language.py
14			@@ -57,7 +57,9 @@ class Language:
15			self.current = "en_US.UTF-8"
16
17			# English name -> native name mapping
18			- search = ('lang-names', '/usr/lib/anaconda/lang-names')
19			+ search = ('lang-names', '/tmp/updates/lang-names',
20			+ '/mnt/source/RHupdates/lang-names',
21			+ '/usr/lib/anaconda/lang-names')
22			for path in search:
23			if os.access(path, os.R_OK):
24			f = open(path, 'r')
25			@@ -109,6 +111,8 @@ class Language:
26
27			def getNickByName (self, name):
28			for k in self.localeInfo.keys():
29			+ if k == 'C':
30			+ continue
31			row = self.localeInfo[k]
32			if row[0] == name:
33			return k
34			--
35	slords	1.7	1.7.1
36	slords	1.1