From aef48072ece9a58bc77552a4f88db51d48beb904 Mon Sep 17 00:00:00 2001 From: 2 * r + 2 * t <61896496+soramanew@users.noreply.github.com> Date: Sun, 14 Jun 2026 21:29:56 +1000 Subject: [PATCH] fix: actually use component error --- src/caelestia/subcommands/install.py | 4 ++-- src/caelestia/utils/dots/manifest.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/caelestia/subcommands/install.py b/src/caelestia/subcommands/install.py index 0f18be3..e81bdcc 100644 --- a/src/caelestia/subcommands/install.py +++ b/src/caelestia/subcommands/install.py @@ -6,7 +6,7 @@ from argparse import Namespace from pathlib import Path from caelestia.utils.dots.deployer import Deployer -from caelestia.utils.dots.manifest import Manifest, ManifestError, expand, expand_dests +from caelestia.utils.dots.manifest import ComponentError, Manifest, ManifestError, expand, expand_dests from caelestia.utils.dots.packages import DEFAULT_AUR_HELPER, PackageInstaller from caelestia.utils.dots.source import DotsSource, SourceError from caelestia.utils.dots.state import DotsState @@ -108,7 +108,7 @@ class Command: enable=_parse_list_arg(self.args.enable_components), disable=_parse_list_arg(self.args.disable_components), ) - except ManifestError as e: + except (ManifestError, ComponentError) as e: fatal(e) names = ", ".join(manifest.enabled_components) or "none" diff --git a/src/caelestia/utils/dots/manifest.py b/src/caelestia/utils/dots/manifest.py index cb3f64b..6488078 100644 --- a/src/caelestia/utils/dots/manifest.py +++ b/src/caelestia/utils/dots/manifest.py @@ -130,11 +130,11 @@ class Manifest: for name in enable_set | disable_set: if name not in known: - raise ManifestError(f"unknown component: {name}") + raise ComponentError(f"unknown component: {name}") conflict = enable_set & disable_set if conflict: - raise ManifestError(f"component(s) both enabled and disabled: {', '.join(sorted(conflict))}") + raise ComponentError(f"component(s) both enabled and disabled: {', '.join(sorted(conflict))}") enabled = {name for name, comp in self.components.items() if comp.default} enabled |= enable_set