From 53a1af591079c234a6dc8006ff29b0f13c98b57a Mon Sep 17 00:00:00 2001 From: Nico Rikken Date: Mon, 22 Apr 2024 20:44:14 +0200 Subject: [PATCH] chore: restore license_directory in project As the approach in lint module no longer use the license_directory, the change can be reverted. Signed-off-by: Nico Rikken --- src/reuse/project.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/reuse/project.py b/src/reuse/project.py index 1f0d7659..105c5c7e 100644 --- a/src/reuse/project.py +++ b/src/reuse/project.py @@ -3,7 +3,6 @@ # SPDX-FileCopyrightText: 2023 Carmen Bianca BAKKER # SPDX-FileCopyrightText: 2023 Matthias Riße # SPDX-FileCopyrightText: 2023 DB Systel GmbH -# SPDX-FileCopyrightText: 2024 Nico Rikken # # SPDX-License-Identifier: GPL-3.0-or-later @@ -66,9 +65,6 @@ def __init__( include_meson_subprojects: bool = False, ): self.root = Path(root) - self.licenses_directory = self.root.joinpath("LICENSES").relative_to( - self.root - ) if vcs_strategy is None: vcs_strategy = VCSStrategyNone @@ -373,7 +369,7 @@ def _find_licenses(self) -> Dict[str, Path]: # TODO: This method does more than one thing. We ought to simplify it. license_files: Dict[str, Path] = {} - directory = str(self.licenses_directory / "**") + directory = str(self.root / "LICENSES/**") for path_str in glob.iglob(directory, recursive=True): path = Path(path_str) # For some reason, LICENSES/** is resolved even though it