Merge lp:~azzar1/software-properties/depends-on-keyring into lp:software-properties

[Andrea Azzarone]

Depends on gnome-keyring, which provides org.freedesktop.secrets.service.

[Sebastien Bacher (seb128)]

Thank you for the change, gnome-keyring should be fine but I'm unsure all desktops use/want it. What happens if the depends is missing? Could we make it a Recommends instead and somewhat handle/warn the user if it's missing?

review: Needs Information

[lp:~azzar1/software-properties/depends-on-keyring]

1014. By Andrea Azzarone on 2018-04-03

Mark gnome-kerying as recommended and avoid crashing if not installed.

[Andrea Azzarone (azzar1)]

Done!

[lp:~azzar1/software-properties/depends-on-keyring]

1015. By Andrea Azzarone on 2018-04-03

Merge with trunk.

[Sebastien Bacher (seb128)]

thanks but you don't want gnome-keyring to be an alternative recommends to the other session but an additional one, e.g don't add a "|" but a "," and list it on a new line

review: Needs Fixing

[lp:~azzar1/software-properties/depends-on-keyring]

1016. By Andrea Azzarone on 2018-04-03

Fix debian/control.

[Andrea Azzarone (azzar1)]

Done!

[Sebastien Bacher (seb128)]

thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-03 08:41:44 +0000
+++ debian/changelog	2018-04-03 15:04:17 +0000
@@ -1,3 +1,12 @@
+software-properties (0.96.24.26) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - Mark gnome-keyring as recommended, which provides org.freedesktop.secrets.service.
+  * GoaAuty.py:
+    - Show warning and avoid crashing if gnome-keyring is not installed. (LP: #1760096)
+
+ -- Andrea Azzarone <[e-mail]>  Tue, 03 Apr 2018 16:04:32 +0200
+
 software-properties (0.96.24.25) bionic; urgency=medium
 
   * ppa.py:

=== modified file 'debian/control'
--- debian/control	2018-03-30 13:59:59 +0000
+++ debian/control	2018-04-03 15:04:17 +0000
@@ -66,7 +66,8 @@
  ubuntu-drivers-common (>= 1:0.2.75),
  python3-gi,
  libgtk3-perl
-Recommends: gnome-session-bin | xfce4-session | lubuntu-default-settings | lxqt-session
+Recommends: gnome-session-bin | xfce4-session | lubuntu-default-settings | lxqt-session,
+ gnome-keyring
 Description: manage the repositories that you install software from (gtk)
  This software provides an abstraction of the used apt repositories.
  It allows you to easily manage your distribution and independent software

=== modified file 'softwareproperties/GoaAuth.py'
--- softwareproperties/GoaAuth.py	2018-03-14 19:23:29 +0000
+++ softwareproperties/GoaAuth.py	2018-04-03 15:04:17 +0000
@@ -22,7 +22,8 @@
 import gi
 gi.require_version('Goa', '1.0')
 gi.require_version('Secret', '1')
-from gi.repository import Goa, GObject, Secret
+from gi.repository import GLib, Goa, GObject, Secret
+import logging
 
 SECRETS_SCHEMA = Secret.Schema.new('com.ubuntu.SotwareProperties',
                                    Secret.SchemaFlags.NONE,
@@ -102,8 +103,11 @@
 
     def _load(self):
         # Retrieve the stored account-id
-        account_id = Secret.password_lookup_sync(SECRETS_SCHEMA, {'key': 'account-id'}, None)
-        self._update_state_from_account_id(account_id)
+        try:
+            account_id = Secret.password_lookup_sync(SECRETS_SCHEMA, {'key': 'account-id'}, None)
+            self._update_state_from_account_id(account_id)
+        except GLib.GError as e:
+            logging.warning ("Connection to session keyring failed: {}".format(e))
 
     def _store(self):
         if self.logged: