Rev 6573: (jameinel) Fix bug #1107464, in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

Patch Queue Manager pqm at pqm.ubuntu.com
Thu Feb 7 09:25:17 UTC 2013


At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6573 [merge]
revision-id: pqm at pqm.ubuntu.com-20130207092516-eax0tqbckd3oiaw8
parent: pqm at pqm.ubuntu.com-20121210101833-06scfp3a4w0x0z87
parent: dylanmccall at ubuntu.com-20130130055538-bq141zfdskr0s9dw
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2013-02-07 09:25:16 +0000
message:
  (jameinel) Fix bug #1107464,
   to allow the test suite to pass when python-apport is installed. (Dylan
   McCall)
modified:
  bzrlib/crash.py                crash.py-20090812083334-d6volool4lktdjcx-1
=== modified file 'bzrlib/crash.py'
--- a/bzrlib/crash.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/crash.py	2013-01-30 05:55:38 +0000
@@ -170,7 +170,7 @@
     pr['Platform'] = platform.platform(aliased=1)
     pr['UserEncoding'] = osutils.get_user_encoding()
     pr['FileSystemEncoding'] = sys.getfilesystemencoding()
-    pr['Locale'] = os.environ.get('LANG')
+    pr['Locale'] = os.environ.get('LANG', 'C')
     pr['BzrPlugins'] = _format_plugin_list()
     pr['PythonLoadedModules'] = _format_module_list()
     pr['BzrDebugFlags'] = pprint.pformat(debug.debug_flags)
@@ -259,7 +259,7 @@
         os.open(filename, 
             os.O_WRONLY|os.O_CREAT|os.O_EXCL,
             0600),
-        'w')
+        'wb')
 
 
 def _format_plugin_list():




More information about the bazaar-commits mailing list