ossa-scanner 0.1.43__tar.gz → 0.1.45__tar.gz

{ossa_scanner-0.1.43 → ossa_scanner-0.1.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.43
+Version: 0.1.45
 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.45/ossa_scanner/__init__.py

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

{ossa_scanner-0.1.43 → ossa_scanner-0.1.45}/ossa_scanner/utils/package_manager.py

@@ -159,24 +159,21 @@ def parse_apt_info(output, package_name, output_dir):
 
 def apt_get_license_from_source(package_name, output_dir):
     try:
-
         p_hash = hash(package_name) % 10000
         src_output_dir = os.path.join(output_dir, str(p_hash))
         os.makedirs(src_output_dir, exist_ok=True)
         print(package_name, 'cwd:', src_output_dir)
         cmd = ['apt-get', 'source', package_name]
         subprocess.run(cmd, check=True, cwd=src_output_dir, capture_output=True, text=True)
-        source_dirs = [d for d in os.listdir(src_output_dir) if d.startswith(package_name) and os.path.isdir(d)]
-        print('source_dirs:', source_dirs)
-        print('directory:', os.listdir(src_output_dir))
         for item in os.listdir(src_output_dir):
             path = os.path.join(src_output_dir, item)
             if item.startswith(package_name) and os.path.isdir(path):
                 print(f"{item} → Directory")
-        if not source_dirs:
+                package_dir = path
+            elif item.startswith(package_name):
+                shutil.rmtree(path, ignore_errors=True)
+        if not package_dir:
             return "NOASSERTION"
-        print(package_name, source_dirs)
-        package_dir = source_dirs[0]
         copyright_file = os.path.join(package_dir, "debian", "copyright")
         licenses = []
         if os.path.exists(copyright_file):
@@ -184,7 +181,7 @@ def apt_get_license_from_source(package_name, output_dir):
                 for line in f:
                     if re.search(r"(?i)license:", line):
                         licenses.append(line.split(":", 1)[1].strip())
-        shutil.rmtree(package_dir, ignore_errors=True)
+        shutil.rmtree(src_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}")

{ossa_scanner-0.1.43 → ossa_scanner-0.1.45}/ossa_scanner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.43
+Version: 0.1.45
 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.43/ossa_scanner/__init__.py

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