Merge ~alexmurray/ubuntu-security-tools:customer-ppa-tracking-2 into ubuntu-security-tools:master

[Alex Murray]

Changes for UST needed with https://code.launchpad.net/~alexmurray/ubuntu-cve-tracker/+git/ubuntu-cve-tracker-1/+merge/405366

diff --git a/build-tools/umt b/build-tools/umt
index a6c1a1c..38e0773 100755
--- a/build-tools/umt
+++ b/build-tools/umt
@@ -2058,7 +2058,7 @@ def cmd_search():
     # Use release_list sorting order
     # We could sort by release version, but that wouldn't properly sort
     # PPA-maintained releases
-    srcmap = source_map.load_ppa()
+    srcmap = source_map.load_subprojects_lists()
     for release in source_map.cve_lib.all_releases:
         if release in release_keys:
             # remove from release_keys so we don't print it a second time
@@ -4507,14 +4507,11 @@ def process_source_files(details, source_dest, merge=False, debug=False):
 
 
 def _get_ppa_name(url, url_sub):
-    ppa_map = {'esm-infra-security': 'esm'}
     name = None
 
     index = url.find(url_sub)
     if index > -1:
         name = url[index:].split('/')[3]
-        if name in ppa_map:
-            name = ppa_map[name]
 
     return name
 
@@ -4525,17 +4522,23 @@ def _get_snappy_ppa_name(url, url_sub):
 
     return name
 
-def get_ppa_name(url):
+def get_product_name(url, release):
     '''translation function for overlay ppas; returns None if not a
        known overlay ppa'''
 
-    name = None
+    product, series, details = source_map.cve_lib.get_subproject_by_ppa_url_and_series(url, release)
+    if product:
+        if "alias" in details:
+            product = details["alias"]
+        else:
+            product = product + "/" + series
+        return product
 
     UrlHandler = collections.namedtuple('UrlHandler', 'url_sub get_ppa_name')
     handlers = [
         UrlHandler('/ppa.launchpad.net/ci-train-ppa-service/', _get_ppa_name),
         UrlHandler('/ppa.launchpad.net/snappy-dev/', _get_snappy_ppa_name),
-        UrlHandler('/private-ppa.launchpad.net/ubuntu-esm/', _get_ppa_name)]
+    ]
 
     for handler in handlers:
         name = handler.get_ppa_name(url, handler.url_sub)
@@ -4585,9 +4588,9 @@ Returns the following data structure:
             else:
                 release = release_pocket
                 pocket = 'release'
-                extra_name = get_ppa_name(url)
-                if extra_name is not None:
-                    release += "/%s" % extra_name
+                product = get_product_name(url, release)
+                if product is not None:
+                    release = product
 
         # Only process Sources
         if pkg_type == 'Sources' and (include_backports or pocket != 'backports'):
diff --git a/utilities/ceviche b/utilities/ceviche
index 20b54d5..2a87d27 100755
--- a/utilities/ceviche
+++ b/utilities/ceviche
@@ -724,13 +724,8 @@ def reload_persistent_data(stdscr, opt):
 
     finaltable = []
 
-    subprojects = list()
-    if opt.esm:
-        subprojects = cve_lib.find_subprojects()
-
     (cves, uems) = cve_lib.get_cve_list()
-    (table, priority, cves, namemap, cveinfo) = cve_lib.load_table(cves, uems,
-                                                   subprojects=subprojects)
+    (table, priority, cves, namemap, cveinfo) = cve_lib.load_table(cves, uems)
 
     for cve in cves:
         for package in table[cve]: