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
=== 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 @@
795795
796 def add_key(self, path):796 def add_key(self, path):
797 """Add a gnupg key to the list of trusted software vendors"""797 """Add a gnupg key to the list of trusted software vendors"""
798 if not isinstance(path, str):
799 path = str(path) # allows non-ascii filenames
800 if not os.path.exists(path):798 if not os.path.exists(path):
801 return False799 return False
802 try:800 try:
@@ -807,9 +805,9 @@
807 return False805 return False
808806
809 def add_key_from_data(self, keydata):807 def add_key_from_data(self, keydata):
810 "Add a gnupg key from a data string (e.g. copy-n-paste)"808 "Add a gnupg key from a utf-8 data string (e.g. copy-n-paste)"
811 tmp = tempfile.NamedTemporaryFile()809 tmp = tempfile.NamedTemporaryFile()
812 tmp.write(keydata.encode())810 tmp.write(keydata.encode("utf-8"))
813 tmp.flush()811 tmp.flush()
814 return self.add_key(tmp.name)812 return self.add_key(tmp.name)
815813
816814
=== 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 @@
756 def on_auth_drag_data_received(self, widget, context, x, y,756 def on_auth_drag_data_received(self, widget, context, x, y,
757 selection, target_type, timestamp):757 selection, target_type, timestamp):
758 """Extract the dropped key and add it to the keyring"""758 """Extract the dropped key and add it to the keyring"""
759 keydata = selection.data.strip()759 keydata = selection.get_data().strip()
760 if not self.add_key_from_data(keydata):760 if not self.add_key_from_data(keydata):
761 error(self.window_main,761 error(self.window_main,
762 _("Error importing key"),762 _("Error importing key"),
@@ -764,6 +764,9 @@
764 "or it might be corrupt."))764 "or it might be corrupt."))
765 self.show_keys()765 self.show_keys()
766766
767 def add_key_from_data(self, keydata):
768 return self.backend.AddKeyFromData(keydata)
769
767 def on_button_revert_clicked(self, button):770 def on_button_revert_clicked(self, button):
768 """Restore the source list from the startup of the dialog"""771 """Restore the source list from the startup of the dialog"""
769 try:772 try:

Subscribers

People subscribed via source and target branches

to all changes: