ossa-scanner 0.1.35__tar.gz → 0.1.37__tar.gz

{ossa_scanner-0.1.35 → ossa_scanner-0.1.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.35
+Version: 0.1.37
 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.37/ossa_scanner/__init__.py

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

{ossa_scanner-0.1.35 → ossa_scanner-0.1.37}/ossa_scanner/scanner.py

@@ -26,6 +26,7 @@ class Scanner:
         try:
             print(f"Processing package: {package}")
             package_info = get_package_info(self.pm_type, package, self.temp_dir)
+            exit()
             source_files = download_source(self.pm_type, package, self.temp_dir)
             self.save_package_report(package, package_info, source_files)
         except Exception as e:

{ossa_scanner-0.1.35 → ossa_scanner-0.1.37}/ossa_scanner/utils/package_manager.py

@@ -2,7 +2,7 @@ import subprocess
 import re
 import os
 import shutil
-
+import glob
 
 def list_packages(package_manager):
     if package_manager == 'apt':
@@ -158,37 +158,25 @@ 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."""
     p_hash = hash(package_name) % 10000
+    print('p_hash:', p_hash)
     output_dir = os.path.join(output_dir, str(p_hash))
     try:
-        # 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
+        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)]
         if not source_dirs:
             return "NOASSERTION"
-
+        print(package_name, source_dirs)
         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.35 → ossa_scanner-0.1.37}/ossa_scanner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.35
+Version: 0.1.37
 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.35/ossa_scanner/__init__.py

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