Merge lp:~anthonywong/ubuntu/trusty/command-not-found/lp1029204 into lp:ubuntu/trusty/command-not-found

Proposed by Anthony Wong
Status: Merged
Merge reported by: Anthony Wong
Merged at revision: not available
Proposed branch: lp:~anthonywong/ubuntu/trusty/command-not-found/lp1029204
Merge into: lp:ubuntu/trusty/command-not-found
Diff against target: 30 lines (+11/-1)
2 files modified
command-not-found (+4/-1)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~anthonywong/ubuntu/trusty/command-not-found/lp1029204
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+211537@code.launchpad.net

Description of the change

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'command-not-found'
2--- command-not-found 2012-06-29 13:46:06 +0000
3+++ command-not-found 2014-03-18 14:17:32 +0000
4@@ -37,7 +37,10 @@
5 if sys.version < '3':
6 kwargs["unicode"] = True
7 cnf.install(**kwargs)
8- locale.setlocale(locale.LC_ALL, '')
9+ try:
10+ locale.setlocale(locale.LC_ALL, '')
11+ except locale.Error:
12+ locale.setlocale(locale.LC_ALL, 'C')
13
14
15 def fix_sys_argv(encoding=None):
16
17=== modified file 'debian/changelog'
18--- debian/changelog 2014-02-23 13:46:33 +0000
19+++ debian/changelog 2014-03-18 14:17:32 +0000
20@@ -1,3 +1,10 @@
21+command-not-found (0.3ubuntu10) trusty; urgency=medium
22+
23+ * Fallback to C locale when current locale is not supported.
24+ (LP: #1029204)
25+
26+ -- Anthony Wong <anthony.wong@ubuntu.com> Tue, 18 Mar 2014 21:59:57 +0800
27+
28 command-not-found (0.3ubuntu9) trusty; urgency=medium
29
30 * Rebuild to drop files installed into /usr/share/pyshared.

Subscribers

People subscribed via source and target branches

to all changes: