From 6d05f2b9e5854b7fefb71bb614378f0651ab3024 Mon Sep 17 00:00:00 2001 From: InsanePrawn Date: Thu, 27 Jan 2022 02:31:51 +0100 Subject: [PATCH] packages.py: cmd_{build,check}: fail if no packages match specified path. also enforce_wrap() in check --- packages.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/packages.py b/packages.py index 54ec2cc..2615c60 100644 --- a/packages.py +++ b/packages.py @@ -191,13 +191,16 @@ def discover_packages() -> dict[str, Package]: return packages -def filter_packages_by_paths(repo: dict[str, Package], paths: list[str]) -> list[Package]: +def filter_packages_by_paths(repo: dict[str, Package], paths: list[str], allow_empty_results=True) -> list[Package]: if 'all' in paths: return repo.values() result = [] for pkg in repo.values(): if pkg.path in paths: result += [pkg] + + if not allow_empty_results and not result: + raise Exception('No packages matched by paths: ' + ', '.join([f'"{p}"' for p in paths])) return result @@ -567,7 +570,7 @@ def build_packages_by_paths( for _arch in set([arch, config.runtime['arch']]): init_prebuilts(_arch) - packages = filter_packages_by_paths(repo, paths) + packages = filter_packages_by_paths(repo, paths, allow_empty_results=False) return build_packages( repo, packages, @@ -682,8 +685,9 @@ def cmd_clean(): @cmd_packages.command(name='check') @click.argument('paths', nargs=-1) def cmd_check(paths): + enforce_wrap() paths = list(paths) - packages = filter_packages_by_paths(discover_packages(), paths) + packages = filter_packages_by_paths(discover_packages(), paths, allow_empty_results=False) for package in packages: name = package.name