瀏覽代碼

support/scripts/pkg-stats: import cve module only when needed

The cve module needs ijson, which may not be installed. Since cve
matching is only enabled when --nvd-path is passed, it is a bit silly
to error out about ijson being missing if it's not used.

So instead of unconditionally importing the cve module, only do it
conditionally.

However, instead of doing it right at the point where it is used, we
do it at the beginning of the main() function. Indeed, if the cve
module is needed but cannot be imported, we want to error out
immediately rather than doing a whole bunch of things, and failing on
the user later on in the middle of the pkg-stats execution.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Heiko Thiery <heiko.thiery@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 824032d16854ae3c0e6e67c534a7e8850199091a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Thomas Petazzoni 4 年之前
父節點
當前提交
ee4e2f1611
共有 1 個文件被更改,包括 6 次插入1 次删除
  1. 6 1
      support/scripts/pkg-stats

+ 6 - 1
support/scripts/pkg-stats

@@ -32,7 +32,6 @@ brpath = os.path.normpath(os.path.join(os.path.dirname(__file__), "..", ".."))
 
 
 sys.path.append(os.path.join(brpath, "utils"))
 sys.path.append(os.path.join(brpath, "utils"))
 from getdeveloperlib import parse_developers  # noqa: E402
 from getdeveloperlib import parse_developers  # noqa: E402
-import cve as cvecheck  # noqa: E402
 
 
 
 
 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)")
 INFRA_RE = re.compile(r"\$\(eval \$\(([a-z-]*)-package\)\)")
@@ -950,7 +949,13 @@ def parse_args():
 
 
 
 
 def __main__():
 def __main__():
+    global cvecheck
+
     args = parse_args()
     args = parse_args()
+
+    if args.nvd_path:
+        import cve as cvecheck
+
     if args.packages:
     if args.packages:
         package_list = args.packages.split(",")
         package_list = args.packages.split(",")
     elif args.configpackages:
     elif args.configpackages: