Merge lp:~cjwatson/update-manager/changelog-source-version into lp:update-manager

[Colin Watson]

Use the source version to generate changelog URIs, not the binary version.

I can't see any downsides to this, and it seems to work for me in some quick local testing. I suspect that when this code was originally written the source_version attribute didn't exist, but it has existed since 2010.

[Brian Murray (brian-murray)]

I also did some local testing of this and did not encounter any issues. Thanks for making this change.

review: Approve

=== modified file 'UpdateManager/Core/MyCache.py'
--- UpdateManager/Core/MyCache.py	2018-10-01 15:56:40 +0000
+++ UpdateManager/Core/MyCache.py	2019-03-26 12:58:13 +0000
@@ -221,10 +221,9 @@
         # use the section of the candidate as a starting point
         section = pkg._pcache._depcache.get_candidate_ver(pkg._pkg).section
 
-        # get the source version, start with the binaries version
-        srcver_epoch = pkg.candidate.version
+        # get the source version
+        srcver_epoch = pkg.candidate.source_version
         srcver = self._strip_epoch(srcver_epoch)
-        #print("bin: %s" % binver)
 
         split_section = section.split("/")
         if len(split_section) > 1:
@@ -333,7 +332,7 @@
 
         spphs = archive.getPublishedSources(source_name=cdt.source_name,
                                             exact_match=True,
-                                            version=cdt.version)
+                                            version=cdt.source_version)
         if not spphs:
             logging.error("No published sources were retrieved from the "
                           "Launchpad API.")
@@ -354,7 +353,7 @@
         if "(" in srcrec:
             srcver = srcrec.split("(")[1].rstrip(")")
         else:
-            srcver = pkg.candidate.version
+            srcver = pkg.candidate.source_version
         base_uri = deb_uri.rpartition("/")[0]
         return base_uri + "/%s_%s.changelog" % (srcpkg, srcver)
 
@@ -438,7 +437,7 @@
             return
         # fixup epoch handling version
         srcpkg = self[name].candidate.source_name
-        srcver_epoch = self[name].candidate.version.replace(':', '%3A')
+        srcver_epoch = self[name].candidate.source_version.replace(':', '%3A')
         try:
             changelog = self._get_changelog_or_news(name, "changelog")
             if len(changelog) == 0:
 
=== modified file 'debian/changelog'
--- debian/changelog	2019-02-10 18:24:18 +0000
+++ debian/changelog	2019-03-26 12:58:13 +0000
@@ -1,3 +1,10 @@
+update-manager (1:19.04.4) UNRELEASED; urgency=medium
+
+  * Use the source version to generate changelog URIs, not the binary
+    version (LP: #655917).
+
+ -- Colin Watson <[e-mail]>  Tue, 26 Mar 2019 12:52:51 +0000
+
 update-manager (1:19.04.3) disco; urgency=medium
 
   * Add gnome-shell as the first alternate for the polkit-1-auth-agent