Merge lp:~gary-lasker/software-center/fix-crash-lp967036 into lp:software-center

Proposed by Gary Lasker on 2012-03-29
Status: Merged
Merged at revision: 2934
Proposed branch: lp:~gary-lasker/software-center/fix-crash-lp967036
Merge into: lp:software-center
Diff against target: 20 lines (+2/-1)
1 file modified
softwarecenter/ui/gtk3/widgets/labels.py (+2/-1)
To merge this branch: bzr merge lp:~gary-lasker/software-center/fix-crash-lp967036
Reviewer Review Type Date Requested Status
Michael Vogt 2012-03-29 Approve on 2012-03-30
Review via email: mp+100003@code.launchpad.net

Description of the change

Small branch to fix a crash due to a UnicodeDecodeError when accessing the short description for H/W requirements.

Thanks!

To post a comment you must log in.
Michael Vogt (mvo) wrote :

Thanks for this fix.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwarecenter/ui/gtk3/widgets/labels.py'
2--- softwarecenter/ui/gtk3/widgets/labels.py 2012-03-15 21:47:29 +0000
3+++ softwarecenter/ui/gtk3/widgets/labels.py 2012-03-29 19:11:22 +0000
4@@ -20,6 +20,7 @@
5 from gettext import gettext as _
6
7 from softwarecenter.hw import get_hw_short_description
8+from softwarecenter.utils import utf8
9
10
11 class HardwareRequirementsLabel(Gtk.HBox):
12@@ -70,7 +71,7 @@
13 s = self.LABEL
14 return _(s) % {
15 "sym": sym,
16- "hardware": _(get_hw_short_description(self.tag))
17+ "hardware": _(utf8(get_hw_short_description(self.tag)))
18 }
19
20 def set_hardware_requirement(self, tag, result):

Subscribers

People subscribed via source and target branches