summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2005-04-04 14:46:57 +0000
committerChris Lumens <clumens@redhat.com>2005-04-04 14:46:57 +0000
commit402228a68f37e64dddeb9e2773ae4d57df7af510 (patch)
treec2c994d2d225d9ed39f4733c206abcb5eca784d4
parent0e8b0d32630f4dccff572e25b6b216ee8e4d7e10 (diff)
downloadanaconda-402228a68f37e64dddeb9e2773ae4d57df7af510.tar.gz
anaconda-402228a68f37e64dddeb9e2773ae4d57df7af510.tar.xz
anaconda-402228a68f37e64dddeb9e2773ae4d57df7af510.zip
Add locale information for 'C' to fix RPM building.
-rw-r--r--ChangeLog7
-rw-r--r--anaconda.spec5
-rw-r--r--language.py3
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index aaf93833d..ca7d60007 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-04 Chris Lumens <clumens@redhat.com>
+
+ * anaconda.spec: Bump version.
+
+ * language.py (Language.__init__): Add settings for the 'C' locale to
+ prevent a traceback when building an RPM.
+
2005-04-02 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/anaconda.spec b/anaconda.spec
index 9a910f3e5..9580f3d4a 100644
--- a/anaconda.spec
+++ b/anaconda.spec
@@ -1,5 +1,5 @@
Name: anaconda
-Version: 10.2.0.39
+Version: 10.2.0.40
Release: 1
License: GPL
Summary: Graphical system installer
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
/sbin/chkconfig --del reconfig >/dev/null 2>&1 || :
%changelog
+* Mon Apr 04 2005 Chris Lumens <clumens@redhat.com> 10.2.0.40-1
+- Add locale information for 'C' to fix RPM building.
+
* Sat Apr 2 2005 Jeremy Katz <katzj@redhat.com> - 10.2.0.39-1
- fix makefile deps to fix build
diff --git a/language.py b/language.py
index c63e9959e..c9d0116ee 100644
--- a/language.py
+++ b/language.py
@@ -90,6 +90,9 @@ class Language:
f.close()
+ # Hard code this to prevent errors in the build environment.
+ self.localeInfo['C'] = self.localeInfo['en_US.UTF-8']
+
# long name -> (nick, map, font) mapping
search = ('locale-list', '/usr/share/anaconda/locale-list')
for path in search: