Shinonome/caelestia-cli
1
0
Fork 1
mirror of https://github.com/caelestia-dots/cli.git synced 2026-06-16 05:49:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: actually use component error

Browse Source
This commit is contained in:
2 * r + 2 * t
2026-06-14 21:29:56 +10:00
parent 216547c9c1
commit aef48072ec
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/caelestia/subcommands/install.py
+2 -2
View File
@@ -6,7 +6,7 @@ from argparse import Namespace
from pathlib import Path from pathlib import Path
from caelestia.utils.dots.deployer import Deployer 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.packages import DEFAULT_AUR_HELPER, PackageInstaller
from caelestia.utils.dots.source import DotsSource, SourceError from caelestia.utils.dots.source import DotsSource, SourceError
from caelestia.utils.dots.state import DotsState from caelestia.utils.dots.state import DotsState
@@ -108,7 +108,7 @@ class Command:
enable=_parse_list_arg(self.args.enable_components), enable=_parse_list_arg(self.args.enable_components),
disable=_parse_list_arg(self.args.disable_components), disable=_parse_list_arg(self.args.disable_components),
) )
except ManifestError as e: except (ManifestError, ComponentError) as e:
fatal(e) fatal(e)
names = ", ".join(manifest.enabled_components) or "none" names = ", ".join(manifest.enabled_components) or "none"
src/caelestia/utils/dots/manifest.py
+2 -2
View File
@@ -130,11 +130,11 @@ class Manifest:
for name in enable_set | disable_set: for name in enable_set | disable_set:
if name not in known: if name not in known:
raise ManifestError(f"unknown component: {name}") raise ComponentError(f"unknown component: {name}")
conflict = enable_set & disable_set conflict = enable_set & disable_set
if conflict: 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 = {name for name, comp in self.components.items() if comp.default}
enabled |= enable_set enabled |= enable_set