fix: is_subdir to return True when path == root (#558)

* fix: is_subdir to return True when path == root

regression introduced in #480
fix #557

Author: mayeut

src/auditwheel/elfutils.py

@@ -126,16 +126,6 @@ def elf_read_rpaths(fn: Path) -> dict[str, list[str]]:
     return result
 
 
-def is_subdir(path: str | Path | None, directory: str | Path) -> bool:
-    if path is None:
-        return False
-
-    path = Path(path).resolve()
-    directory = Path(directory).resolve()
-
-    return directory in path.parents
-
-
 def get_undefined_symbols(path: Path) -> set[str]:
     undef_symbols = set()
     with open(path, "rb") as f:

src/auditwheel/policy/__init__.py

@@ -9,12 +9,12 @@
 from pathlib import Path
 from typing import Any
 
-from auditwheel.elfutils import filter_undefined_symbols, is_subdir
-
 from ..architecture import Architecture
+from ..elfutils import filter_undefined_symbols
 from ..lddtree import DynamicExecutable
 from ..libc import Libc, get_libc
 from ..musllinux import find_musl_libc, get_musl_version
+from ..tools import is_subdir
 
 _HERE = Path(__file__).parent
 LIBPYTHON_RE = re.compile(r"^libpython\d+\.\d+m?.so(.\d)*$")

src/auditwheel/repair.py

@@ -15,9 +15,10 @@
 
 from auditwheel.patcher import ElfPatcher
 
-from .elfutils import elf_read_dt_needed, elf_read_rpaths, is_subdir
+from .elfutils import elf_read_dt_needed, elf_read_rpaths
 from .hashfile import hashfile
 from .policy import WheelPolicies, get_replace_platforms
+from .tools import is_subdir
 from .wheel_abi import get_wheel_elfdata
 from .wheeltools import InWheelCtx, add_platforms
 

src/auditwheel/tools.py

@@ -231,3 +231,13 @@ def __call__(
         option_string: str | None = None,  # noqa: ARG002
     ) -> None:
         setattr(namespace, self.dest, values)
+
+
+def is_subdir(path: str | Path | None, root: str | Path) -> bool:
+    if path is None:
+        return False
+
+    path = Path(path).resolve()
+    root = Path(root).resolve()
+
+    return root == path or root in path.parents

tests/unit/test_tools.py

@@ -8,7 +8,7 @@
 
 import pytest
 
-from auditwheel.tools import EnvironmentDefault, dir2zip, zip2dir
+from auditwheel.tools import EnvironmentDefault, dir2zip, is_subdir, zip2dir
 
 
 @pytest.mark.parametrize(
@@ -205,3 +205,13 @@ def test_dir2zip_folders(tmp_path: Path) -> None:
             else:
                 assert info.filename == "dummy-1.0.dist-info/METADATA"
     assert len(expected_dirs) == 0
+
+
+def test_is_subdir(tmp_path: Path) -> None:
+    root = tmp_path / "root"
+    subdir = root / "subdir"
+    subdir.mkdir(parents=True)
+    assert is_subdir(subdir, root)
+    assert is_subdir(root, root)
+    assert not is_subdir(None, root)
+    assert not is_subdir(tmp_path, root)