From e5147670424f1fa948b1c4dbc8397ff84f792f16 Mon Sep 17 00:00:00 2001 From: Matt Davis Date: Wed, 21 Sep 2022 06:27:51 -0400 Subject: [PATCH] Port change from safety vendoring PR to make the vendor renames work the same as patch. --- tasks/vendoring/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/vendoring/__init__.py b/tasks/vendoring/__init__.py index 67924cb4..ceda6f51 100644 --- a/tasks/vendoring/__init__.py +++ b/tasks/vendoring/__init__.py @@ -595,10 +595,10 @@ def license_destination(vendor_dir, libname, filename): lowercase = vendor_dir / libname.lower().replace("-", "_") if lowercase.is_dir(): return lowercase / filename - rename_dict = LIBRARY_RENAMES if vendor_dir.name != "patched" else PATCHED_RENAMES + # rename_dict = LIBRARY_RENAMES if vendor_dir.name != "patched" else PATCHED_RENAMES # Short circuit all logic if we are renaming the whole library - if libname in rename_dict: - return vendor_dir / rename_dict[libname] / filename + # if libname in rename_dict: + # return vendor_dir / rename_dict[libname] / filename if libname in LIBRARY_DIRNAMES: override = vendor_dir / LIBRARY_DIRNAMES[libname] if not override.exists() and override.parent.exists():