Merge lp:~vorlon/update-manager/ubuntu-support-optimize into lp:update-manager

[Steve Langasek]

[Brian Murray (brian-murray)]

I'd guess this is going into artful in which case you'd want the version number to be 1:17.10.1. I've added some comments in-line.

Is there something that calls ubuntu-support-staus? If it used regularly then maybe the release_date should be cached somewhere.

review: Needs Fixing

[Steve Langasek (vorlon)]

> Is there something that calls ubuntu-support-status? If it used regularly then
> maybe the release_date should be cached somewhere.

It is not, this is an admin-facing tool. I don't think we need to cache anything beyond just leveraging distro-data; reading the csv file once per invocation is cheap (especially when compared to looking up a releases file once per package!).

[Brian Murray (brian-murray)]

Okay, I was thinking about hwe-support-status which is used by update-notifier.

[lp:~vorlon/update-manager/ubuntu-support-optimize]

2764. By Steve Langasek on 2017-04-28

sort(ish) the imports

2765. By Steve Langasek on 2017-04-28

in all cases where we can't find a valid Ubuntu release date, throw an error

2766. By Steve Langasek on 2017-04-28

fix changelog version

[Brian Murray (brian-murray)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2017-03-14 21:51:43 +0000
+++ debian/changelog	2017-04-28 18:30:36 +0000
@@ -1,3 +1,12 @@
+update-manager (1:17.10.1) UNRELEASED; urgency=medium
+
+  * ubuntu-support-status: instead of checking the Release timestamp in
+    the releases file for every single package on the system, get the
+    release date from distro-info-data because it will always be the same. 
+    This speeds up the script by > 50% in testing.
+
+ -- Steve Langasek <[e-mail]>  Thu, 27 Apr 2017 23:38:05 -0700
+
 update-manager (1:17.04.3) zesty; urgency=medium
 
   * Use a 64 bit integer for launch-time instead of a 32 bit one which won't

=== modified file 'debian/control'
--- debian/control	2017-03-14 20:46:06 +0000
+++ debian/control	2017-04-28 18:30:36 +0000
@@ -24,6 +24,7 @@
          ${misc:Depends}, 
          python3-update-manager (= ${source:Version}),
          python3-distro-info,
+         distro-info-data,
          lsb-release,
          ubuntu-release-upgrader-core
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)

=== modified file 'ubuntu-support-status'
--- ubuntu-support-status	2016-07-21 20:30:51 +0000
+++ ubuntu-support-status	2017-04-28 18:30:36 +0000
@@ -3,25 +3,46 @@
 from __future__ import print_function
 
 import apt
+import csv
 import locale
 import datetime
 import operator
 import os
 import subprocess
+import time
 import gettext
 import sys
 
 from apt.utils import (
     get_maintenance_end_date,
-    get_release_date_from_release_file,
-    get_release_filename_for_pkg,
     )
 from optparse import OptionParser
 from UpdateManager.Core.utils import twrap, get_dist
 
 CODENAME = get_dist()
 
-def get_maintenance_status(cache, pkgname, supported_tag):
+def get_release_date(dist):
+    distro_data = '/usr/share/distro-info/ubuntu.csv'
+    release_date = None
+    try:
+        with open(distro_data) as csvfile:
+            csv_reader = csv.DictReader(csvfile)
+            for row in csv_reader:
+                if row['series'] == CODENAME:
+                    release_date = row['release']
+                    break
+    except FileNotFoundError:
+        return None
+
+    if not release_date:
+        return None
+
+    time_t = time.mktime(time.strptime(release_date, '%Y-%m-%d'))
+    release_date = datetime.datetime.fromtimestamp(time_t)
+    return release_date
+
+
+def get_maintenance_status(supported_tag, release_date):
     if supported_tag.endswith("y"):
         supported_for_n_month = 12*int(supported_tag.rstrip("y"))
     elif supported_tag.endswith("m"):
@@ -29,25 +50,6 @@
     else:
         raise Exception("Unsupported tag '%s'" % supported_tag)
 
-    # try to figure out the support dates of the release and make
-    # sure to look only for stuff in "Ubuntu" and "distro_codename"
-    # (to exclude stuff in ubuntu-updates for the support time 
-    # calculation because the "Release" file time for that gets
-    # updated regularly)
-    for suite in ["", "-updates", "-proposed", "-security"]:
-        releasef = get_release_filename_for_pkg(cache, pkgname, 
-                                                "Ubuntu", CODENAME+suite)
-        if releasef:
-            break
-    else:
-        raise Exception("No Release file found for %s" % pkgname)
-
-    time_t = get_release_date_from_release_file(releasef)
-    # check the release date and show support information
-    # based on this
-    if not time_t:
-        raise Exception("No date tag found")
-    release_date = datetime.datetime.fromtimestamp(time_t)
     now = datetime.datetime.now()
 
     # mvo: we do not define the end date very precisely
@@ -116,6 +118,15 @@
     # total count, for statistics
     total = 0
 
+    release_date = None
+
+    if CODENAME != 'unknown distribution':
+        release_date = get_release_date(CODENAME)
+
+    if not release_date:
+        print ("No valid Ubuntu release found, support status unknown")
+        sys.exit(1)
+
     # analyze
     with apt.Cache() as cache:
         for pkg in cache:
@@ -129,8 +140,8 @@
                     continue
                 # get support time
                 support_tag = pkg.candidate.record["Supported"]
-                (still_supported, support_str) = get_maintenance_status(cache,
-                    pkg.name, support_tag)
+                (still_supported, support_str) = get_maintenance_status(
+                    support_tag, release_date)
                 if not still_supported:
                     unsupported.add(pkg.name)
                     continue