Merge ~litios/ubuntu-cve-tracker:oval/customer-merge-support into ubuntu-cve-tracker:master

[David Fernandez Gonzalez]

Once generating OVAL, we only had support for the elder parent being a base Ubuntu release.

This PR allows other cases.

[Eduardo Barretto (ebarretto)]

lgtm, thanks!

review: Approve

diff --git a/scripts/cve_lib.py b/scripts/cve_lib.py
index a3104fa..91aa59c 100755
--- a/scripts/cve_lib.py
+++ b/scripts/cve_lib.py
@@ -878,10 +878,7 @@ def release_version(rel):
         try:
             version = details["version"]
         except KeyError:
-            rel = release_progenitor(rel)
-            _, _, _, details = get_subproject_details(rel)
-            if details:
-                version = details["version"]
+            return release_version(release_progenitor(rel))
     return version
 
 def release_ppas(rel):
diff --git a/scripts/oval_lib.py b/scripts/oval_lib.py
index 17650ee..6273d08 100755
--- a/scripts/oval_lib.py
+++ b/scripts/oval_lib.py
@@ -528,7 +528,8 @@ class OvalGenerator:
     def _init_ids(self, release):
         # e.g. codename for trusty/esm should be trusty
         self.release = release
-        self.release_codename = cve_lib.release_progenitor(self.release) if cve_lib.release_progenitor(self.release) else self.release.replace('/', '_')
+        self.release_codename = cve_lib.release_progenitor(self.release) if cve_lib.release_progenitor(self.release) else self.release
+        self.release_codename = self.release_codename.replace('/', '_')
         self.release_name = cve_lib.release_name(self.release)
 
         self.parent_releases = list()