Merge lp:~azzar1/software-properties/fix-1762082 into lp:software-properties

[Andrea Azzarone]

debian/control: Move gir1.2-goa-1.0, gir1.2-secret-1, and gir1.2-snapd-1 dependencies from software-properties-commom to software-properties-gtk (LP: #1762082).

[lp:~azzar1/software-properties/fix-1762082]

1018. By Andrea Azzarone on 2018-04-09

Wrap "from gi.repository import Snapd" inside a try/except block in order to avoid failures in add-apt-repository.

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-04 07:35:56 +0000
+++ debian/changelog	2018-04-09 19:29:40 +0000
@@ -1,3 +1,13 @@
+software-properties (0.96.24.27) UNRELEASED; urgency=medium
+
+  * debian/control: Move gir1.2-goa-1.0, gir1.2-secret-1,
+    and gir1.2-snapd-1 dependencies from software-properties-common
+    to software-properties-gtk (LP: #1762082).
+  * SoftwareProperties.py: Wrap importing of gir1.2-snapd-1 in a
+    try-except block in order to avoid failures in add-apt-repository.
+
+ -- Andrea Azzarone <[e-mail]>  Mon, 09 Apr 2018 09:19:23 +0200
+
 software-properties (0.96.24.26) bionic; urgency=medium
 
   * debian/control:
 
=== modified file 'debian/control'
--- debian/control	2018-04-03 15:03:47 +0000
+++ debian/control	2018-04-09 19:29:40 +0000
@@ -41,9 +41,8 @@
 Package: software-properties-common
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}, python3,
- python3-gi, gir1.2-glib-2.0, gir1.2-goa-1.0 (>= 3.27.92-1ubuntu1), gir1.2-secret-1, gir1.2-snapd-1,
- python-apt-common (>= 0.9), python3-dbus, python3-software-properties (= ${binary:Version}),
- ca-certificates
+ python3-gi, gir1.2-glib-2.0, python-apt-common (>= 0.9), python3-dbus,
+ python3-software-properties (= ${binary:Version}), ca-certificates
 Breaks: python-software-properties (<< 0.85), python3-software-properties (<< 0.85)
 Replaces: python-software-properties (<< 0.85), python3-software-properties (<< 0.85)
 Description: manage the repositories that you install software from (common)
@@ -60,6 +59,9 @@
  python3-software-properties (= ${binary:Version}),
  python3-gi,
  gir1.2-gtk-3.0,
+ gir1.2-goa-1.0 (>= 3.27.92-1ubuntu1),
+ gir1.2-secret-1,
+ gir1.2-snapd-1,
  python3-aptdaemon.gtk3widgets,
  python3-distro-info,
  software-properties-common,
 
=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2018-04-03 14:36:44 +0000
+++ softwareproperties/SoftwareProperties.py	2018-04-09 19:29:40 +0000
@@ -66,8 +66,13 @@
 from . import cloudarchive
 
 import gi
-gi.require_version('Snapd', '1')
-from gi.repository import Gio, Snapd
+from gi.repository import Gio
+
+try:
+  gi.require_version('Snapd', '1')
+  from gi.repository import Snapd
+except (ImportError, ValueError):
+  pass
 
 _SHORTCUT_FACTORIES = [
     ppa.shortcut_handler,