-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <[email protected]>
- Loading branch information
1 parent
84547a7
commit 53a1af5
Showing
1 changed file
with
1 addition
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,7 +3,6 @@ | |
# SPDX-FileCopyrightText: 2023 Carmen Bianca BAKKER <[email protected]> | ||
# SPDX-FileCopyrightText: 2023 Matthias Riße | ||
# SPDX-FileCopyrightText: 2023 DB Systel GmbH | ||
# SPDX-FileCopyrightText: 2024 Nico Rikken <[email protected]> | ||
# | ||
# 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 | ||
|