Address feedback from reviews

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>

Author: AyanSinhaMahapatra

src/packagedcode/pypi.py

@@ -13,6 +13,7 @@
 import json
 import logging
 import os
+import posixpath
 import re
 import sys
 import tempfile
@@ -395,8 +396,9 @@ def assign_package_to_resources(cls, package, resource, codebase, package_adder)
             return
 
         site_packages = dist_info_dir.parent(codebase)
-        if not site_packages:
+        if not (site_packages and site_packages.name == "site-packages"):
             return
+
         package_data = resource.package_data
         assert len(resource.package_data) == 1, (
             f'Unsupported Pypi METADATA wheel structure: {resource.path!r} '
@@ -417,6 +419,7 @@ def assign_package_to_resources(cls, package, resource, codebase, package_adder)
                 # most of thense are references to bin ../../../bin/wheel
                 cannot_resolve = False
                 ref_resource = site_packages
+                # note that resolving leading ".." always stays in the codebase 
                 while path_ref.startswith('..'):
                     _, _, path_ref = path_ref.partition('../')
                     ref_resource = ref_resource.parent(codebase)
@@ -429,14 +432,14 @@ def assign_package_to_resources(cls, package, resource, codebase, package_adder)
                     continue
                 else:
                     ref_resource = codebase.get_resource(
-                        path=os.path.join(ref_resource.path, path_ref)
+                        path=posixpath.join(ref_resource.path, path_ref)
                     )
                     if ref_resource and package_uid:
                         package_adder(package_uid, ref_resource, codebase)
             else:
                 # These are absolute paths from the site-packages directory
                 ref_resource = codebase.get_resource(
-                    path=os.path.join(site_packages.path, path_ref)
+                    path=posixpath.join(site_packages.path, path_ref)
                 )
                 if ref_resource and package_uid:
                     package_adder(package_uid, ref_resource, codebase)

tests/packagedcode/data/pypi/site-packages/codebase/bin/pip-3.8

@@ -39,4 +39,3 @@ click/termui.py,sha256=mZ12uc3-loFaV__vr8buxn9uIjAhy7QwVuZOQ8jDdjc,28873
 click/testing.py,sha256=ptpMYgRY7dVfE3UDgkgwayu9ePw98sQI3D7zZXiCpj4,16063
 click/types.py,sha256=rj2g3biAXKkNKV8vlwbIKSUlixhXybH84N84fwCYqUU,35092
 click/utils.py,sha256=M8tuplcFFHROha3vQ60ZRSakSB_ng6w9e8Uc1AugPZ0,18934
-../../../bin/pip,,