Merge lp:~brunonova/ubuntu/trusty/software-properties/lp1381050_lp1383289 into lp:ubuntu/trusty-proposed/software-properties

Proposed by Bruno Nova
Status: Needs review
Proposed branch: lp:~brunonova/ubuntu/trusty/software-properties/lp1381050_lp1383289
Merge into: lp:ubuntu/trusty-proposed/software-properties
Diff against target: 47 lines (+6/-5)
2 files modified
softwareproperties/SoftwareProperties.py (+2/-4)
softwareproperties/gtk/SoftwarePropertiesGtk.py (+4/-1)
To merge this branch: bzr merge lp:~brunonova/ubuntu/trusty/software-properties/lp1381050_lp1383289
Reviewer Review Type Date Requested Status
Brian Murray Approve
Michael Vogt Approve
Review via email: mp+249534@code.launchpad.net

Description of the change

This branch backports the fixes for bugs LP: #1381050 and LP: #1383289 into Trusty.

I've tested this and it seems to be working.
I executed software-properties-dbus (as root) and software-properties-gtk directly from the cloned branch.

I have not updated the debian control files, including the changelog.
I have also not included the testcase that you wrote, Michael (should I?).
And after this, I think we should also backport this into Utopic.

To post a comment you must log in.
Revision history for this message
Bruno Nova (brunonova) wrote :

Michael Vogt said he would sponsor the upload, but he hasn't yet.
No problem! Maybe he forgot or is too busy.

I request a new review from the Ubuntu SRU Team (or Michael). Sorry if it's the wrong team.
Could someone check this merge request?

Revision history for this message
Michael Vogt (mvo) wrote :

I'm happy to sponsor this, sorry that I forgot about it. Could you please add the SRU header to the bugs? See https://wiki.ubuntu.com/StableReleaseUpdates#SRU_Bug_Template for the details.

review: Approve
Revision history for this message
Michael Vogt (mvo) wrote :

I uploaded this now to trusty-proposed.

Revision history for this message
Bruno Nova (brunonova) wrote :

No problem, and thank you!

I just updated the bugs with the SRU headers.

I'll test the -proposed update when available.

Revision history for this message
Michael Vogt (mvo) wrote :

Thanks you rock!

Revision history for this message
Brian Murray (brian-murray) :
review: Approve
Revision history for this message
Bruno Nova (brunonova) wrote :

I tested the -proposed update now. Bug #1381050 is not fixed.
It seems your simplification doesn't work after all, Michael (and I didn't test it properly).
@Michael, check what I wrote in that bug report and say something there, or here.

So, it seems I don't rock. :)

Unmerged revisions

141. By Bruno Nova

- fix dragging a key into the list of keys in the "Authentication"
  tab (LP: #1383289)
- fix import of keys with special chars (LP: #1381050)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'softwareproperties/SoftwareProperties.py'
2--- softwareproperties/SoftwareProperties.py 2013-10-16 16:20:43 +0000
3+++ softwareproperties/SoftwareProperties.py 2015-02-12 16:47:35 +0000
4@@ -795,8 +795,6 @@
5
6 def add_key(self, path):
7 """Add a gnupg key to the list of trusted software vendors"""
8- if not isinstance(path, str):
9- path = str(path) # allows non-ascii filenames
10 if not os.path.exists(path):
11 return False
12 try:
13@@ -807,9 +805,9 @@
14 return False
15
16 def add_key_from_data(self, keydata):
17- "Add a gnupg key from a data string (e.g. copy-n-paste)"
18+ "Add a gnupg key from a utf-8 data string (e.g. copy-n-paste)"
19 tmp = tempfile.NamedTemporaryFile()
20- tmp.write(keydata.encode())
21+ tmp.write(keydata.encode("utf-8"))
22 tmp.flush()
23 return self.add_key(tmp.name)
24
25
26=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
27--- softwareproperties/gtk/SoftwarePropertiesGtk.py 2014-01-10 12:23:07 +0000
28+++ softwareproperties/gtk/SoftwarePropertiesGtk.py 2015-02-12 16:47:35 +0000
29@@ -756,7 +756,7 @@
30 def on_auth_drag_data_received(self, widget, context, x, y,
31 selection, target_type, timestamp):
32 """Extract the dropped key and add it to the keyring"""
33- keydata = selection.data.strip()
34+ keydata = selection.get_data().strip()
35 if not self.add_key_from_data(keydata):
36 error(self.window_main,
37 _("Error importing key"),
38@@ -764,6 +764,9 @@
39 "or it might be corrupt."))
40 self.show_keys()
41
42+ def add_key_from_data(self, keydata):
43+ return self.backend.AddKeyFromData(keydata)
44+
45 def on_button_revert_clicked(self, button):
46 """Restore the source list from the startup of the dialog"""
47 try:

Subscribers

People subscribed via source and target branches

to all changes: