[yum-cvs] yum-utils repoquery.py,1.45,1.46

Panu Matilainen pmatilai at linux.duke.edu
Fri Jun 15 05:55:40 UTC 2007


Update of /home/groups/yum/cvs/yum-utils
In directory login1.linux.duke.edu:/tmp/cvs-serv2402

Modified Files:
	repoquery.py 
Log Message:
Ugly kludge to force local preferred encoding for stdout when redirected
to a file where python defaults to ascii... ick. Mostly fixes rhbz#239744.


Index: repoquery.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoquery.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- repoquery.py	23 May 2007 14:17:38 -0000	1.45
+++ repoquery.py	15 Jun 2007 05:55:38 -0000	1.46
@@ -696,6 +696,12 @@
         repoq.logger.error( e)
         sys.exit(1)
 
+    # ick.. python assumes ascii encoding if stdout is not a tty, force
+    # it to preferred locale 
+    if not sys.stdout.isatty():
+        import codecs, locale
+        sys.stdout = codecs.getwriter(locale.getpreferredencoding())(sys.stdout)
+
     repoq.runQuery(regexs)
 
 if __name__ == "__main__":




More information about the Yum-cvs-commits mailing list