ossa-scanner 0.1.32__tar.gz → 0.1.34__tar.gz

{ossa_scanner-0.1.32 → ossa_scanner-0.1.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.32
+Version: 0.1.34
 Summary: Open Source Software Advisory generator for Core and Base Linux Packages.
 Home-page: https://github.com/oscarvalenzuelab/ossa_scanner
 Author: Oscar Valenzuela

ossa_scanner-0.1.34/ossa_scanner/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.1.34"

{ossa_scanner-0.1.32 → ossa_scanner-0.1.34}/ossa_scanner/utils/package_manager.py

@@ -142,12 +142,13 @@ def parse_apt_info(output, package_name, output_dir):
 
     if "licenses" not in info:
         info["licenses"] = apt_get_license_from_source(package_name, output_dir)
-    if info["licenses"]:
+        print(package_name, info["licenses"])
+    if "licenses" in info:
         info["licenses"] = extract_spdx_ids(info["licenses"])
         info["severity"] = license_classificaton(info["licenses"])
-    else:
-        info["severity"] = "Informational"
+
     print(package_name, output_dir, info)
+
     # Ensure all keys are present even if data is missing
     return {
         "licenses": info.get("licenses", "NOASSERTION"),
@@ -157,21 +158,36 @@ def parse_apt_info(output, package_name, output_dir):
     }
 
 def apt_get_license_from_source(package_name, output_dir):
+    """Fetches source package and extracts license from debian/copyright."""
+
     try:
-        subprocess.run(["apt-get", "source", package_name, '-d', output_dir], check=True, capture_output=True, text=True)
-        source_dirs = [d for d in os.listdir(output_dir) if d.startswith(package_name) and os.path.isdir(d)]
+        # Ensure output directory exists
+        os.makedirs(output_dir, exist_ok=True)
+
+        # Run apt-get source inside output_dir
+        subprocess.run(["apt-get", "source", package_name], check=True, capture_output=True, text=True, cwd=output_dir)
+
+        # Find the extracted source directory (since apt-get source doesn't always use package_name directly)
+        source_dirs = glob.glob(os.path.join(output_dir, f"{package_name}-*"))  # Wildcard match for versioned package dirs
         if not source_dirs:
             return "NOASSERTION"
+
         package_dir = source_dirs[0]
         copyright_file = os.path.join(package_dir, "debian", "copyright")
+
+        # Extract license information
         licenses = []
         if os.path.exists(copyright_file):
             with open(copyright_file, "r", encoding="utf-8") as f:
                 for line in f:
                     if re.search(r"(?i)license:", line):
                         licenses.append(line.split(":", 1)[1].strip())
+
+        # Cleanup
         shutil.rmtree(output_dir, ignore_errors=True)
+
         return ", ".join(set(licenses)) if licenses else "NOASSERTION"
+
     except subprocess.CalledProcessError as e:
         print(f"Error fetching source package: {e}")
         return "NOASSERTION"

{ossa_scanner-0.1.32 → ossa_scanner-0.1.34}/ossa_scanner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.32
+Version: 0.1.34
 Summary: Open Source Software Advisory generator for Core and Base Linux Packages.
 Home-page: https://github.com/oscarvalenzuelab/ossa_scanner
 Author: Oscar Valenzuela

ossa_scanner-0.1.32/ossa_scanner/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.1.32"