generate.py: Adjust option '-d' to DSA tracker file

The old option for -d was dedicated to provide a folder where to find the
*.wml and *.data files are around.
This option is in that way not needed anymore as we don't need to read
these files now anymore.

Transform that configuration option so the user can control the used
Security Tracker data file. If this option isn't used a default will get
used.

1 files changed, 12 insertions, 7 deletions

diff --git a/english/security/oval/generate.py b/english/security/oval/generate.py
index fb04dc6237d..16420ce6231 100755
--- a/english/security/oval/generate.py
+++ b/english/security/oval/generate.py
@@ -16,6 +16,7 @@ import logging
 import pprint
 import re
 import subprocess
+import sys
 from typing import Any
 
 import oval.definition.generator
@@ -40,8 +41,6 @@ DEBIAN_VERSION = {
     "sid": "1000",
 }
 
-DSA_DATA_FILE = "../data/dsa.data"
-
 
 def printdsas(ovals):
     """Generate and print OVAL Definitions for collected DSA information"""
@@ -270,9 +269,14 @@ def main(args):
         else:
             logging.basicConfig(level=logging.WARNING)
 
+    if os.path.isfile(args["tracker_data_file"]):
+        dsa_data_file = args["tracker_data_file"]
+    else:
+        logging.error("Using option -d requires a valid file!")
+        sys.exit(1)
+
     # unpack args
     json_file = args["JSONfile"]
-    data_dir = args["data_directory"]
     temp_file = args["tmp"]
     release = args["release"]
 
@@ -304,7 +308,7 @@ def main(args):
     ovals = parseJSON(ovals, json_data, release)
     logging.info("Finished parsing JSON data")
     #ovals = parsedirs(ovals, data_dir, re.compile("^d[ls]a.+\.data$"), 2, release)
-    collect_dsa_data(ovals, release, DSA_DATA_FILE)
+    collect_dsa_data(ovals, release, dsa_data_file)
     printdsas(ovals)
 
 
@@ -338,10 +342,11 @@ if __name__ == "__main__":
     )
     PARSER.add_argument(
         "-d",
-        "--data-directory",
+        "--tracker-data-file",
         type=str,
-        help="Local directory to parse for data/wml file." "default=.",
-        default=".",
+        help="dsa.data file with Security Tracker information to use. "
+        "default=../data/dsa.data",
+        default="../data/dsa.data"
     )
     PARSER.add_argument(
         "-t",