ossa-scanner 0.1.38__tar.gz → 0.1.40__tar.gz

{ossa_scanner-0.1.38 → ossa_scanner-0.1.40}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.38
+Version: 0.1.40
 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.40/ossa_scanner/__init__.py

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

{ossa_scanner-0.1.38 → ossa_scanner-0.1.40}/ossa_scanner/utils/package_manager.py

@@ -158,14 +158,17 @@ def parse_apt_info(output, package_name, output_dir):
     }
 
 def apt_get_license_from_source(package_name, output_dir):
-    p_hash = hash(package_name) % 10000
-    print('p_hash:', p_hash)
-    output_dir = os.path.join(output_dir, str(p_hash))
-    os.makedirs(output_dir, exist_ok=True)
-    print('output_dir:', output_dir)
     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)]
+
+        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)
+
+        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)
+        
         if not source_dirs:
             return "NOASSERTION"
         print(package_name, source_dirs)
@@ -177,7 +180,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(output_dir, ignore_errors=True)
+        shutil.rmtree(package_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.38 → ossa_scanner-0.1.40}/ossa_scanner.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ossa_scanner
-Version: 0.1.38
+Version: 0.1.40
 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.38/ossa_scanner/__init__.py

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