From 3ddfc9e73e8068d64894daca7eab9cb9dc2086b2 Mon Sep 17 00:00:00 2001 From: Andrew Olsen Date: Fri, 13 Dec 2024 13:13:47 +1300 Subject: [PATCH] Fix some bugs in fix_vendor_libs --- vcpkg-vendor/fix_vendor_libs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg-vendor/fix_vendor_libs.py b/vcpkg-vendor/fix_vendor_libs.py index 4a5be688..704c1e9f 100755 --- a/vcpkg-vendor/fix_vendor_libs.py +++ b/vcpkg-vendor/fix_vendor_libs.py @@ -728,7 +728,7 @@ def get_pattern_for_dep(dep): def lib_names_match(dep1, dep2): base1, ext1 = split_lib_ext(Path(dep1).name) - base2, ext2 = split_lib_ext(Path(dep1).name) + base2, ext2 = split_lib_ext(Path(dep2).name) return ext1 == ext2 and base1.startswith(base2) or base2.startswith(base1) @@ -835,7 +835,7 @@ def exe_and_lib_paths(): deps_by_result[ALLOWED_SYSTEM_DEP], deps_by_result[UNEXPECTED_SYSTEM_DEP], ) - count = len(deps_by_result[ALLOWED_SYSTEM_DEP]) + count = len(deps_by_result[UNEXPECTED_SYSTEM_DEP]) L.error( f"{ERR} Checking deps: Found %s system deps that have not been explicitly allowed.\n%s", count,