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

[Bruno Nova]

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.

[Bruno Nova (brunonova)]

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?

[Michael Vogt (mvo)]

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

[Michael Vogt (mvo)]

I uploaded this now to trusty-proposed.

[Bruno Nova (brunonova)]

No problem, and thank you!

I just updated the bugs with the SRU headers.

I'll test the -proposed update when available.

[Michael Vogt (mvo)]

Thanks you rock!

[Brian Murray (brian-murray)]

review: Approve

[Bruno Nova (brunonova)]

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 on 2015-02-12

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

=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2013-10-16 16:20:43 +0000
+++ softwareproperties/SoftwareProperties.py	2015-02-12 16:47:35 +0000
@@ -795,8 +795,6 @@
 
   def add_key(self, path):
     """Add a gnupg key to the list of trusted software vendors"""
-    if not isinstance(path, str):
-      path = str(path) # allows non-ascii filenames
     if not os.path.exists(path):
         return False
     try:
@@ -807,9 +805,9 @@
         return False
 
   def add_key_from_data(self, keydata):
-    "Add a gnupg key from a data string (e.g. copy-n-paste)"
+    "Add a gnupg key from a utf-8 data string (e.g. copy-n-paste)"
     tmp = tempfile.NamedTemporaryFile()
-    tmp.write(keydata.encode())
+    tmp.write(keydata.encode("utf-8"))
     tmp.flush()
     return self.add_key(tmp.name)
 
 
=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2014-01-10 12:23:07 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2015-02-12 16:47:35 +0000
@@ -756,7 +756,7 @@
     def on_auth_drag_data_received(self, widget, context, x, y,
                                    selection, target_type, timestamp):
         """Extract the dropped key and add it to the keyring"""
-        keydata = selection.data.strip()
+        keydata = selection.get_data().strip()
         if not self.add_key_from_data(keydata):
             error(self.window_main,
                   _("Error importing key"),
@@ -764,6 +764,9 @@
                     "or it might be corrupt."))
         self.show_keys()
 
+    def add_key_from_data(self, keydata):
+        return self.backend.AddKeyFromData(keydata)
+
     def on_button_revert_clicked(self, button):
         """Restore the source list from the startup of the dialog"""
         try: