ossa-scanner 0.1.43__py3-none-any.whl → 0.1.45__py3-none-any.whl

ossa_scanner/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.43"
+__version__ = "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.dist-info → ossa_scanner-0.1.45.dist-info}/METADATA

@@ -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.dist-info → ossa_scanner-0.1.45.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ossa_scanner/__init__.py,sha256=PwEipAcIgfEks4UpVgOERoR8Az-FCfCGocVnb0rkncM,23
+ossa_scanner/__init__.py,sha256=G1Bw5SEeRoSlHVxmFKf6PIpK38SHTYTFhSFGm9d8YQM,23
 ossa_scanner/cli.py,sha256=sgr8NFpf_Ut84KYFQjOKRxv8CfAMaTPhMo7DbR53lT4,2311
 ossa_scanner/scanner.py,sha256=4VfkM2h-Y1zFQnqdBxpav5OhRoTdjdmFbF5VOXKKoXU,4821
 ossa_scanner/uploader.py,sha256=dPbhSLlQcDyHP-6Ugn6BzYGn_VQ1Ik6TWt2138k3REo,1837
@@ -6,11 +6,11 @@ ossa_scanner/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuF
 ossa_scanner/utils/downloader.py,sha256=AGRhJU9YducTe6mY5-7mZ4fRTFg2tcfz1DS0Nee-wM0,5693
 ossa_scanner/utils/hash_calculator.py,sha256=LrDKngWOPbizYJWab2sDJDLB4pD_RrI51L0cZt3VjJY,960
 ossa_scanner/utils/os_detection.py,sha256=35VbUbFklzd7aojgltKf2PxbnVFcpREA7Tri2YI5nfY,417
-ossa_scanner/utils/package_manager.py,sha256=wxNah4GePyhd2FzVFX8JFsv1Ac9ztk7Vb9jKgtBiKDo,9166
+ossa_scanner/utils/package_manager.py,sha256=kQ293LbJ1Jb-tzpeWpgLOmmjFd9Z4SK8fY96l7OS1CQ,9017
 ossa_scanner/utils/swhid_calculator.py,sha256=7-bO4RglJr-kt5SjUfnlcPZD0k0-s_dveHEjRo-zEMc,1317
-ossa_scanner-0.1.43.dist-info/LICENSE,sha256=9slQ_XNiEkio28l90NwihP7a90fCL2GQ6YhcVXTBls4,1064
-ossa_scanner-0.1.43.dist-info/METADATA,sha256=MRl8u-vDuJc7pXnBJf-ubSDHnYbpdFbw_cywl9L3rdE,1938
-ossa_scanner-0.1.43.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-ossa_scanner-0.1.43.dist-info/entry_points.txt,sha256=UVoAo-wTPxT82g3cfqTs2CmQnazd57TAwhd9VwEKD1c,55
-ossa_scanner-0.1.43.dist-info/top_level.txt,sha256=uUp5CvhZfJLapXn9DyUXvgH7QK3uzF2ibH943lWN5Bs,13
-ossa_scanner-0.1.43.dist-info/RECORD,,
+ossa_scanner-0.1.45.dist-info/LICENSE,sha256=9slQ_XNiEkio28l90NwihP7a90fCL2GQ6YhcVXTBls4,1064
+ossa_scanner-0.1.45.dist-info/METADATA,sha256=wxBVtOWzMn7MGHTHyAHclJ_gOPYT13JracJyYBqkLrM,1938
+ossa_scanner-0.1.45.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+ossa_scanner-0.1.45.dist-info/entry_points.txt,sha256=UVoAo-wTPxT82g3cfqTs2CmQnazd57TAwhd9VwEKD1c,55
+ossa_scanner-0.1.45.dist-info/top_level.txt,sha256=uUp5CvhZfJLapXn9DyUXvgH7QK3uzF2ibH943lWN5Bs,13
+ossa_scanner-0.1.45.dist-info/RECORD,,