Merge lp:~dylanmccall/bzr/bug-1107464 into lp:bzr

Proposed by Dylan McCall on 2013-01-30
Status: Merged
Approved by: John A Meinel on 2013-02-07
Approved revision: 6574
Merged at revision: 6573
Proposed branch: lp:~dylanmccall/bzr/bug-1107464
Merge into: lp:bzr
Diff against target: 21 lines (+2/-2)
1 file modified
bzrlib/crash.py (+2/-2)
To merge this branch: bzr merge lp:~dylanmccall/bzr/bug-1107464
Reviewer Review Type Date Requested Status
John A Meinel 2013-01-30 Approve on 2013-01-30
Review via email: mp+145547@code.launchpad.net

Commit message

Fix bug #1107464, to allow the test suite to pass when python-apport is installed.

Description of the change

This fixes a failing test, bzrlib.tests.test_crash.TestApportReporting.test_apport_report, as reported in bug #1107464. With this patch, bzr selftest finishes successfully inside the minimal environment (with python-apport installed) described in the bug report.

To post a comment you must log in.
John A Meinel (jameinel) wrote :

Seems good to me.

review: Approve
John A Meinel (jameinel) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/crash.py'
2--- bzrlib/crash.py 2011-12-19 13:23:58 +0000
3+++ bzrlib/crash.py 2013-01-30 06:01:23 +0000
4@@ -170,7 +170,7 @@
5 pr['Platform'] = platform.platform(aliased=1)
6 pr['UserEncoding'] = osutils.get_user_encoding()
7 pr['FileSystemEncoding'] = sys.getfilesystemencoding()
8- pr['Locale'] = os.environ.get('LANG')
9+ pr['Locale'] = os.environ.get('LANG', 'C')
10 pr['BzrPlugins'] = _format_plugin_list()
11 pr['PythonLoadedModules'] = _format_module_list()
12 pr['BzrDebugFlags'] = pprint.pformat(debug.debug_flags)
13@@ -259,7 +259,7 @@
14 os.open(filename,
15 os.O_WRONLY|os.O_CREAT|os.O_EXCL,
16 0600),
17- 'w')
18+ 'wb')
19
20
21 def _format_plugin_list():