Software Properties

Merge lp:~gilir/software-properties/fix-721778 into lp:software-properties

  1. fix-721778
  2. Merge into main
Proposed by Julien Lavergne
Status: Rejected
Rejected by: Martin Pitt
Proposed branch: lp:~gilir/software-properties/fix-721778
Merge into: lp:software-properties
Diff against target: 27 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
softwareproperties/gtk/DialogAdd.py (+1/-1)
To merge this branch: bzr merge lp:~gilir/software-properties/fix-721778
Reviewer Review Type Date Requested Status
Martin Pitt Disapprove
Review via email: mp+51669@code.launchpad.net

Description of the change

Fix for bug #721778.
Seems that now a double % can't work like this. I'm not sure it's the correct solution, but it fixed the problem, with the same result.

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks for this! However, I think it's cleaner to fix this with an explicit encode(). See bug for more details.

review: Disapprove

Unmerged revisions

647. By Julien Lavergne

* softwareproperties/gtk/DialogAdd.py
 - Fix encoding out of range (LP: #721778).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-15 08:26:15 +0000
3+++ debian/changelog 2011-03-01 00:51:48 +0000
4@@ -1,3 +1,10 @@
5+software-properties (0.80.3) UNRELEASED; urgency=low
6+
7+ * softwareproperties/gtk/DialogAdd.py
8+ - Fix encoding out of range (LP: #721778).
9+
10+ -- Julien Lavergne <gilir@ubuntu.com> Tue, 01 Mar 2011 00:50:05 +0100
11+
12 software-properties (0.80.2) natty; urgency=low
13
14 * softwareproperties/gtk/SoftwarePropertiesGtk.py: Gdk.window_foreign_new()
15
16=== modified file 'softwareproperties/gtk/DialogAdd.py'
17--- softwareproperties/gtk/DialogAdd.py 2011-01-25 17:56:51 +0000
18+++ softwareproperties/gtk/DialogAdd.py 2011-03-01 00:51:48 +0000
19@@ -59,7 +59,7 @@
20 example = "deb http://ftp.debian.org sarge main"
21 # L10N: the example is of the format: deb http://ftp.debian.org sarge main
22 msg = _("The APT line includes the type, location and components of a "
23- "repository, for example '%s'.") % ("<i>%s</i>" % example)
24+ "repository, for example ") + ("<i>%s</i>." % example)
25 self.label_example_line.set_label(msg)
26
27 def run(self):

Subscribers

People subscribed via source and target branches

to status/vote changes: