Merge lp:~apachelogger/software-properties/python-apt-is-like into lp:software-properties

[Harald Sitter]

Unmerged revisions

987. By Harald Sitter on 2016-11-09

* Use is_like from python-apt to determine whether or not distros
  are compatible. This act as additional constraint to the changes
  introduced in 0.96.24.2 enforcing higher accuracy on whether a
  derivate ought to be considered compatible or not.
  + Bump python-apt requirement to 1.1.0~beta5 to have is_like.

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-23 10:47:57 +0000
+++ debian/changelog	2016-11-09 12:40:49 +0000
@@ -1,3 +1,13 @@
+software-properties (0.96.24.8) UNRELEASED; urgency=medium
+
+  * Use is_like from python-apt to determine whether or not distros
+    are compatible. This act as additional constraint to the changes
+    introduced in 0.96.24.2 enforcing higher accuracy on whether a
+    derivate ought to be considered compatible or not.
+    + Bump python-apt requirement to 1.1.0~beta5 to have is_like.
+
+ -- Harald Sitter <[e-mail]>  Wed, 09 Nov 2016 13:30:13 +0100
+
 software-properties (0.96.24.7) yakkety; urgency=medium
 
   [ Dimitri John Ledkov ]

=== modified file 'debian/control'
--- debian/control	2016-09-21 11:48:24 +0000
+++ debian/control	2016-11-09 12:40:49 +0000
@@ -31,7 +31,7 @@
 Section: python
 Architecture: all
 Depends: ${python3:Depends}, ${misc:Depends}, python3, python3-apt (>=
- 0.6.20ubuntu16), lsb-release, iso-codes, gnupg, dirmngr
+ 1.1.0~beta5), lsb-release, iso-codes, gnupg, dirmngr
 Recommends: unattended-upgrades
 Description: manage the repositories that you install software from
  This software provides an abstraction of the used apt repositories.

=== modified file 'softwareproperties/SoftwareProperties.py'
--- softwareproperties/SoftwareProperties.py	2016-03-16 09:17:42 +0000
+++ softwareproperties/SoftwareProperties.py	2016-11-09 12:40:49 +0000
@@ -675,7 +675,8 @@
     /usr/share/app-install/channels or it is a public Launchpad PPA.
     """
     (srcline, _fname) = shortcut.expand(
-        codename=self.distro.codename, distro=self.distro.id.lower())
+        codename=self.distro.codename, distro=self.distro.id.lower(),
+        distro_is_like=self.distro.is_like)
     channel = self._is_line_in_whitelisted_channel(srcline)
     if channel:
       keyp = "%s/%s.key" % (self.CHANNEL_PATH, channel)
@@ -726,7 +727,8 @@
     """
 
     (deb_line, file) = shortcut.expand(
-        codename=self.distro.codename, distro=self.distro.id.lower())
+        codename=self.distro.codename, distro=self.distro.id.lower(),
+        distro_is_like=self.distro.is_like)
     deb_line = self.expand_http_line(deb_line)
     debsrc_entry_type = 'deb-src' if enable_source_code else '# deb-src'
     debsrc_line = debsrc_entry_type + deb_line[3:]

=== modified file 'softwareproperties/ppa.py'
--- softwareproperties/ppa.py	2016-09-21 20:01:50 +0000
+++ softwareproperties/ppa.py	2016-11-09 12:40:49 +0000
@@ -395,10 +395,11 @@
     def info(self):
         return self._info
 
-    def expand(self, codename, distro=None):
+    def expand(self, codename, distro=None, distro_is_like=[]):
         if (distro is not None
                 and distro != self._info["distribution"]
-                and not series_valid_for_distro(self._info["distribution"], codename)):
+                and not series_valid_for_distro(self._info["distribution"], codename)
+                and not self._info["distribution"] in distro_is_like):
             # The requested PPA is for a foreign distribution.  Guess that
             # the user wants that distribution's current series.
             # This only applies if the local distribution is not the same