Merge lp:~brian-murray/ubuntu-archive-tools/no-deleted into lp:ubuntu-archive-tools

[Brian Murray]

In the pending SRU report we see the following line:

cups 1.7.2-0ubuntu1 1.7.2-0ubuntu1.2 1.7.2-0ubuntu1.4 #1352809 #1386241 12

However, bug 1386241 was fixed in version 1.7.2-0ubuntu1.3 which was then deleted from -proposed and really shouldn't appear in the report. It is appearing because we look at the changelogs for each version between 1.2 and 1.4, but we really should not look at changelog for 1.3 since it was deleted. This fixes that.

[lp:~brian-murray/ubuntu-archive-tools/no-deleted]

938. By Brian Murray on 2015-02-24

sru-report: speed things up a bit by caching launchpad api items used multiple times.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'sru-report'
--- sru-report	2015-02-20 17:42:16 +0000
+++ sru-report	2015-02-24 22:42:10 +0000
@@ -90,26 +90,31 @@
     base_version = None
     base_created = None
     for pub in pubs:
+        p_srcpkg_version = pub.source_package_version
+        p_date_pub = pub.date_published
+        p_pocket = pub.pocket
         if pub.pocket in ('Release', 'Updates'):
             if (base_version is None or
                 apt_pkg.version_compare(
-                    base_version, pub.source_package_version) < 0):
-                base_version = pub.source_package_version
+                    base_version, p_srcpkg_version) < 0):
+                base_version = p_srcpkg_version
                 base_created = pub.date_created
-        elif pub.pocket == 'Proposed':
+        elif p_pocket == 'Proposed':
             history['changesfiles'].append(pub.changesFileUrl())
-            history['published'] = pub.date_published
+            history['published'] = p_date_pub
         logging.debug(
             '%s=%s published to %s/%s on %s' %
-            (sourcename, pub.source_package_version,
-             distro_series.name, pub.pocket, pub.date_published))
-        history[pub.pocket.lower()] = pub.source_package_version
+            (sourcename, p_srcpkg_version,
+             distro_series.name, p_pocket, p_date_pub))
+        history[p_pocket.lower()] = p_srcpkg_version
     if base_version is not None:
         proposed = archive.getPublishedSources(
             source_name=sourcename, exact_match=True,
             distro_series=distro_series, pocket='Proposed',
             created_since_date=base_created)
         for pub in proposed:
+            if pub.status == 'Deleted':
+                continue
             if apt_pkg.version_compare(
                     base_version, pub.source_package_version) >= 0:
                 continue
@@ -680,9 +685,10 @@
                     source_name=published.source_package_name,
                     exact_match=True, status='Published',
                     distro_series=releases[release]):
+                up_srcpkg_version = ubuntu_pub.source_package_version
                 if apt_pkg.version_compare(
-                        latest_ubuntu, ubuntu_pub.source_package_version) < 0:
-                    latest_ubuntu = ubuntu_pub.source_package_version
+                        latest_ubuntu, up_srcpkg_version) < 0:
+                    latest_ubuntu = up_srcpkg_version
 
             logging.debug('  Ubuntu has version %s', latest_ubuntu)