Merge ~alexmurray/ubuntu-cve-tracker:only-add-dne-for-ubuntu-products into ubuntu-cve-tracker:master

[Alex Murray]

This should avoid the previous cases where we would add snap_ entries in CVE files.

[Steve Beattie (sbeattie)]

LGTM and tests okay, merging. Probably we will want to move release_wants_dne() into cve_lib so that e.g. check-syntax can make use of the logic as well.

review: Approve

diff --git a/scripts/active_edit b/scripts/active_edit
index 8f65066..ef3627b 100755
--- a/scripts/active_edit
+++ b/scripts/active_edit
@@ -90,6 +90,12 @@ def create_or_update_external_subproject_cves(cve, pkgname):
     else:
         print("Aborted\n")
 
+def release_wants_dne(release):
+    '''Return true if the release wants to have DNE entries in CVE files.'''
+    # for now only UBUNTU products should have DNE entries
+    _, product, _, _ = cve_lib.get_subproject_details(release)
+    return product != None and product == cve_lib.PRODUCT_UBUNTU
+
 def update_cve(cve, pkgname, fixed_in=None, fixed_in_release=None, fixed_in_release_version=None):
     '''Update an existing CVE file'''
     with open(os.path.join(cvedir, cve), "r") as f:
@@ -153,10 +159,9 @@ def update_cve(cve, pkgname, fixed_in=None, fixed_in_release=None, fixed_in_rele
                 continue
             state = "needs-triage"
             if not pkg_in_rel(pkgname, release):
-                # package doesn't exist in this release - we want to
-                # specify whether it exists but only for progenitor
-                # releases, not derived ones
-                if not cve_lib.release_progenitor(release):
+                # package doesn't exist in this release - see if it wants a
+                # DNE entry
+                if release_wants_dne(release):
                     state = "DNE"
                 else:
                     continue
@@ -248,10 +253,9 @@ def create_cve(cve, pkgname, fixed_in=None, fixed_in_release=None, fixed_in_rele
                 if (rel_pat.search(line)):
                     state = "needs-triage"
                     if not pkg_in_rel(pkgname, release):
-                        # package doesn't exist in this release - we want to
-                        # specify whether it exists but only for progenitor
-                        # releases, not derived ones
-                        if not cve_lib.release_progenitor(release):
+                        # package doesn't exist in this release - see if it wants a
+                        # DNE entry
+                        if release_wants_dne(release):
                             state = "DNE"
                         else:
                             continue