Merge lp:~apachelogger/software-properties/series-check into lp:software-properties

[Harald Sitter]

[Harald Sitter (apachelogger)]

hellow?

[Harald Sitter (apachelogger)]

ping

[Harald Sitter (apachelogger)]

Are we sure this thing is still maintained? :O

[Brian Murray (brian-murray)]

Could you give an example of how we might test this change?

[Harald Sitter (apachelogger)]

> $ grep -E '(ID|CODENAME)' /etc/lsb-release
> DISTRIB_ID=floof
> DISTRIB_CODENAME=xenial

> $ sudo add-apt-repository -m ppa:alexlarsson/ubuntu/xdg-app

this adds yakkety because of the code path in question

> pitchy patchy
> $ sudo add-apt-repository -m -r ppa:alexlarsson/ubuntu/xdg-app
> $ sudo add-apt-repository -m ppa:alexlarsson/ubuntu/xdg-app

now it adds xenial as that is the codename of floof and the codename also exists on launchpad

[lp:~apachelogger/software-properties/series-check]

960. By Harald Sitter on 2016-08-12

merge

961. By Harald Sitter on 2016-08-12

Add a comment about the codename logic todo with series

962. By Harald Sitter on 2016-08-12

fix changelog

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-13 19:27:04 +0000
+++ debian/changelog	2016-08-12 11:52:12 +0000
@@ -1,3 +1,15 @@
+software-properties (0.96.24.2) UNRELEASED; urgency=medium
+
+  * Do not assume that a distribution adding the PPA of another distribution
+    will want the latest series all the time. Instead check if the requested
+    codename (that is the codename of the installed distribution) is a valid
+    series in launchpad for the distribution the PPA belongs to. This
+    essentially enables derivate distributions to carry a different name but
+    use the same series name. As long as launchpad knows about the series we
+    should be fine even if the constraints are a bit lax.
+
+ -- Harald Sitter <[e-mail]>  Mon, 02 May 2016 10:41:50 +0200
+
 software-properties (0.96.24.1) yakkety; urgency=medium
 
    * tests/test_shortcuts.py: make the tests python2 compatible.
 
=== modified file 'softwareproperties/ppa.py'
--- softwareproperties/ppa.py	2016-06-22 13:48:33 +0000
+++ softwareproperties/ppa.py	2016-08-12 11:52:12 +0000
@@ -52,6 +52,7 @@
 LAUNCHPAD_USER_API = 'https://launchpad.net/api/1.0/%s'
 LAUNCHPAD_USER_PPAS_API = 'https://launchpad.net/api/1.0/%s/ppas'
 LAUNCHPAD_DISTRIBUTION_API = 'https://launchpad.net/api/1.0/%s'
+LAUNCHPAD_DISTRIBUTION_SERIES_API = 'https://launchpad.net/api/1.0/%s/%s'
 # Specify to use the system default SSL store; change to a different path
 # to test with custom certificates.
 LAUNCHPAD_PPA_CERT = "/etc/ssl/certs/ca-certificates.crt"
@@ -90,6 +91,14 @@
     lp_url = LAUNCHPAD_PPA_API % (owner_name, ppa)
     return get_info_from_lp(lp_url)
 
+def series_valid_for_distro(distribution, series):
+    lp_url = LAUNCHPAD_DISTRIBUTION_SERIES_API % (distribution, series)
+    try:
+        get_info_from_lp(lp_url)
+        return True
+    except PPAException:
+        return False
+
 def get_current_series_from_lp(distribution):
     lp_url = LAUNCHPAD_DISTRIBUTION_API % distribution
     return os.path.basename(get_info_from_lp(lp_url)["current_series_link"])
@@ -165,7 +174,7 @@
         try:
             # double check that the signing key is a v4 fingerprint (160bit)
             if not verify_keyid_is_v4(signing_key_fingerprint):
-                print("Error: signing key fingerprint '%s' too short" % 
+                print("Error: signing key fingerprint '%s' too short" %
                     signing_key_fingerprint)
                 return False
         except TypeError:
@@ -210,7 +219,7 @@
     def _verify_fingerprint(self, keyring, expected_fingerprint, keyring_dir):
         got_fingerprints = self._get_fingerprints(keyring, keyring_dir)
         if len(got_fingerprints) > 1:
-            print("Got '%s' fingerprints, expected only one" % 
+            print("Got '%s' fingerprints, expected only one" %
                   len(got_fingerprints))
             return False
         got_fingerprint = got_fingerprints[0]
@@ -222,7 +231,7 @@
 
     def add_ppa_signing_key(self, ppa_path=None):
         """Query and add the corresponding PPA signing key.
-        
+
         The signing key fingerprint is obtained from the Launchpad PPA page,
         via a secure channel, so it can be trusted.
         """
@@ -364,9 +373,16 @@
         return self._info
 
     def expand(self, codename, distro=None):
-        if distro is not None and distro != self._info["distribution"]:
+        if (distro is not None
+                and distro != self._info["distribution"]
+                and not series_valid_for_distro(self._info["distribution"], codename)):
             # 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
+            # distribution the remote PPA is associated with AND the local
+            # codename is not equal to the PPA's series.
+            # e.g. local:Foobar/xenial and ppa:Ubuntu/xenial will use 'xenial'
+            #      local:Foobar/fluffy and ppa:Ubuntu/xenial will use '$latest'
             codename = get_current_series_from_lp(self._info["distribution"])
         debline = "deb http://ppa.launchpad.net/%s/%s/%s %s main" % (
             self._info["owner"][1:], self._info["name"],