Merge ~allenpthuang/ubuntu-cve-tracker:fix-expand into ubuntu-cve-tracker:master

[Allen Huang]

Move `self.expand` before `self._load()` in `OvalGenerator`.

Move `self.expand` before its use in `self._load()` in `OvalGenerator`.
This was introduced under the radar because the children classes of
`OvalGenerator` had `self.expand` set before calling `super().__init__`.

[David Fernandez Gonzalez (litios)]

+1 from my end, I also did this change on my local branch.

[Amir Naseredini (sahnaseredini)]

LGTM. thanks Allen.

review: Approve

[Eduardo Barretto (ebarretto)]

lgtm, thanks!

review: Approve

[Eduardo Barretto (ebarretto)]

I've just merged PR 461249 you will need to rebase yours

review: Needs Fixing

[Allen Huang (allenpthuang)]

> I've just merged PR 461249 you will need to rebase yours

Rebased and updated, thanks!

[Eduardo Barretto (ebarretto)]

lgtm, thanks!

review: Approve

diff --git a/scripts/oval_lib.py b/scripts/oval_lib.py
index a974eaf..f51dbb1 100644
--- a/scripts/oval_lib.py
+++ b/scripts/oval_lib.py
@@ -523,8 +523,8 @@ class OvalGenerator:
         self.pkg_cache = pkg_cache
         self.cve_paths = cve_paths
         self.fixed_only = fixed_only
-        self.packages, self.cves = self._load(packages)
         self.expand = expand
+        self.packages, self.cves = self._load(packages)
 
     def _init_ids(self, release):
         # e.g. codename for trusty/esm should be trusty
@@ -1323,7 +1323,6 @@ class OvalGenerator:
 
 class OvalGeneratorPkg(OvalGenerator):
     def __init__(self, releases, cve_paths, packages, progress, pkg_cache, fixed_only=True, cve_cache=None, outdir='./', oval_format='dpkg',expand=False) -> None:
-        self.expand = expand
         super().__init__('pkg', releases, cve_paths, packages, progress, pkg_cache, fixed_only, cve_cache, outdir, oval_format, expand)
 
     def _generate_advisory(self, package: Package) -> etree.Element:
@@ -1529,7 +1528,6 @@ class OvalGeneratorPkg(OvalGenerator):
 
 class OvalGeneratorCVE(OvalGenerator):
     def __init__(self, releases, cve_paths, packages, progress, pkg_cache, fixed_only=True, cve_cache=None, outdir='./', oval_format='dpkg', expand=False) -> None:
-        self.expand = expand
         super().__init__('cve', releases, cve_paths, packages, progress, pkg_cache, fixed_only, cve_cache, outdir, oval_format, expand)
 
     # For CVE OVAL, the definition ID is generated