Merge ~rodrigo-zaiden/ubuntu-cve-tracker:check-syntax-fixup-devel-dne into ubuntu-cve-tracker:master

[Rodrigo Figueiredo Zaiden]

When `./scripts/check-syntax` returns that a package does not exist in devel release, we should mark it as DNE to keep the devel line in the CVE file.

an example of the output with the proposed changes:
 package 'audacity' not in 'kinetic'
 active/CVE-2016-4472: 530: would delete this line
 active/CVE-2016-4472: 530: would insert 'devel_audacity: DNE'

[Alex Murray (alexmurray)]

LGTM - thanks for this!

review: Approve

[Ian Constantin (iconstantin)]

I believe:

     if 'DOES exist' or 'not in' in msg:

should be:

     if 'DOES exist' in msg or 'not in' in msg:

review: Needs Fixing

[Rodrigo Figueiredo Zaiden (rodrigo-zaiden)]

Yeah, that is correct,
I noticed it later when using the script and already fixed on commit 84f05fb582e10fdc068d2147a9808473816b068c direct on master branch to avoid misuse.

Thanks for pointing it.

[Ian Constantin (iconstantin)]

Ah ok cool! Sorry did not check in UCT

diff --git a/scripts/check-syntax-fixup b/scripts/check-syntax-fixup
index a38ad1e..64e3f2e 100755
--- a/scripts/check-syntax-fixup
+++ b/scripts/check-syntax-fixup
@@ -59,6 +59,15 @@ def delete_from_file(filename: str, linenum: int, dryrun=False, verbose=False):
     else:
         print("%s: %d: would delete this line" % (os.path.relpath(filename), linenum))
 
+def get_pkg_rel_from_msg(msg):
+    parts = msg.split(" ")
+    if 'DOES exist' or 'not in' in msg:
+        pkg = parts[1].replace("'", "")
+        rel = parts[-1].replace("'", "")
+    else:
+        pkg = parts[0]
+        rel = parts[-1].replace("'", "")
+    return pkg, rel
 
 parser = argparse.ArgumentParser("Automatically fixup issues flagged by check-syntax")
 parser.add_argument(
@@ -111,13 +120,7 @@ for line in args.infile:
     if "missing release" in msg or 'DOES exist' in msg:
         # e.g. golang missing release 'gke/gke-1.19'
         # e.g. package 'libextractor' DOES exist in 'trusty/esm'
-        parts = msg.split(" ")
-        if 'DOES exist' in msg:
-            pkg = parts[1].replace("'", "")
-            rel = parts[-1].replace("'", "")
-        else:
-            pkg = parts[0]
-            rel = parts[-1].replace("'", "")
+        pkg, rel = get_pkg_rel_from_msg(msg)
 
         # get status from the parent release if there is one
         status = "needs-triage"
@@ -161,8 +164,17 @@ for line in args.infile:
         modified.append(cve)
 
     elif "unknown package" in msg or "not in" in msg or "unknown release" in msg:
+        pkg, rel = get_pkg_rel_from_msg(msg)
+
         # delete this line since
         delete_from_file(cve, linenum, args.dry_run, args.verbose)
+
+        #if release is devel, we should add DNE instead of removing
+        if rel == cve_lib.devel_release:
+            rel = "devel"
+            fixup = "{rel}_{pkg}: {status}\n".format(rel=rel, pkg=pkg, status="DNE")
+            insert_into_file(cve, linenum, fixup, args.dry_run, args.verbose)
+
         modified.append(cve)
     else:
         # print unhandled lines