From 10e4db7c193bd8482185b6681e80934138146021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 30 Aug 2023 16:12:18 +0200 Subject: [PATCH] clan-cli: fix error message --- pkgs/clan-cli/clan_cli/secrets/groups.py | 6 +++--- pkgs/clan-cli/clan_cli/secrets/secrets.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/secrets/groups.py b/pkgs/clan-cli/clan_cli/secrets/groups.py index 37b3cb2a1..92b85fed3 100644 --- a/pkgs/clan-cli/clan_cli/secrets/groups.py +++ b/pkgs/clan-cli/clan_cli/secrets/groups.py @@ -71,7 +71,7 @@ def list_command(args: argparse.Namespace) -> None: def list_directory(directory: Path) -> str: if not directory.exists(): - return "{directory} does not exist" + return f"{directory} does not exist" msg = f"\n{directory} contains:" for f in directory.iterdir(): msg += f"\n {f.name}" @@ -81,7 +81,7 @@ def list_directory(directory: Path) -> str: def add_member(group_folder: Path, source_folder: Path, name: str) -> None: source = source_folder / name if not source.exists(): - msg = f"{name} does not exist in {source_folder}" + msg = f"{name} does not exist in {source_folder}: " msg += list_directory(source_folder) raise ClanError(msg) group_folder.mkdir(parents=True, exist_ok=True) @@ -98,7 +98,7 @@ def add_member(group_folder: Path, source_folder: Path, name: str) -> None: def remove_member(group_folder: Path, name: str) -> None: target = group_folder / name if not target.exists(): - msg = f"{name} does not exist in group in {group_folder}" + msg = f"{name} does not exist in group in {group_folder}: " msg += list_directory(group_folder) raise ClanError(msg) os.remove(target) diff --git a/pkgs/clan-cli/clan_cli/secrets/secrets.py b/pkgs/clan-cli/clan_cli/secrets/secrets.py index 6c4295f7d..89925755c 100644 --- a/pkgs/clan-cli/clan_cli/secrets/secrets.py +++ b/pkgs/clan-cli/clan_cli/secrets/secrets.py @@ -113,7 +113,7 @@ def groups_folder(group: str) -> Path: def list_directory(directory: Path) -> str: if not directory.exists(): - return "{directory} does not exist" + return f"{directory} does not exist" msg = f"\n{directory} contains:" for f in directory.iterdir(): msg += f"\n {f.name}" @@ -125,7 +125,7 @@ def allow_member( ) -> None: source = source_folder / name if not source.exists(): - msg = f"{name} does not exist in {source_folder}" + msg = f"{name} does not exist in {source_folder}: " msg += list_directory(source_folder) raise ClanError(msg) group_folder.mkdir(parents=True, exist_ok=True) @@ -148,7 +148,7 @@ def allow_member( def disallow_member(group_folder: Path, name: str) -> None: target = group_folder / name if not target.exists(): - msg = f"{name} does not exist in group in {group_folder}" + msg = f"{name} does not exist in group in {group_folder}: " msg += list_directory(group_folder) raise ClanError(msg)