Hi,
Looks good to me. But please clear with Dave Lehman before putting this
on f13-branch.
Regards,
Hans
On 03/19/2010 01:16 PM, Ales Kozumplik wrote:
Currently it's ascii and that's bad. import gtk; changes it to utf-8
anyway but that doesn't happen in text install of course. The default
encoding is set vie sitecustomize.py, it is not possible to do so in any
other way.
The patch has been tested with a custom compose.
---
anaconda | 1 +
scripts/upd-instroot | 1 +
sitecustomize.py | 22 ++++++++++++++++++++++
3 files changed, 24 insertions(+), 0 deletions(-)
create mode 100644 sitecustomize.py
diff --git a/anaconda b/anaconda
index e6cdb94..8043e9d 100755
--- a/anaconda
+++ b/anaconda
@@ -1024,6 +1024,7 @@ if __name__ == "__main__":
log.info("anaconda called with cmdline = %s" %(sys.argv,))
log.info("Display mode = %s" % anaconda.displayMode)
+ log.info("Default encoding = %s " % sys.getdefaultencoding())
checkMemory(anaconda)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 584240e..9c12d16 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1018,6 +1018,7 @@ cp $DEST/usr/lib/anaconda/loadkeys-stub $DEST/usr/bin/loadkeys
cp $DEST/usr/lib/anaconda/mknod-stub $DEST/usr/bin/mknod
mv $DEST/usr/sbin/anaconda $DEST/usr/bin/anaconda
mv $DEST/usr/lib/anaconda-runtime/lib* $DEST/usr/$LIBDIR 2>/dev/null
+mv $DEST/usr/lib/anaconda/sitecustomize.py $DEST/usr/$LIBDIR/python?.?/site-packages
mv $DEST/etc/yum.repos.d $DEST/etc/anaconda.repos.d
diff --git a/sitecustomize.py b/sitecustomize.py
new file mode 100644
index 0000000..8246ed0
--- /dev/null
+++ b/sitecustomize.py
@@ -0,0 +1,22 @@
+#
+# sitecustomize.py: The python site init code for the Red Hat Installer
+#
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Red Hat, Inc. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see<http://www.gnu.org/licenses/>.
+#
+
+import sys
+sys.setdefaultencoding('utf-8')
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
