yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

clan-cli: fix error message

Browse Source
This commit is contained in:
Jörg Thalheim
2023-08-30 16:12:18 +02:00
parent 0bf52859fe
commit 10e4db7c19
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/clan-cli/clan_cli/secrets/groups.py
View File

@@ -71,7 +71,7 @@ def list_command(args: argparse.Namespace) -> None:
def list_directory(directory: Path) -> str: def list_directory(directory: Path) -> str:
if not directory.exists(): if not directory.exists():
return "{directory} does not exist" return f"{directory} does not exist"
msg = f"\n{directory} contains:" msg = f"\n{directory} contains:"
for f in directory.iterdir(): for f in directory.iterdir():
msg += f"\n {f.name}" 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: def add_member(group_folder: Path, source_folder: Path, name: str) -> None:
source = source_folder / name source = source_folder / name
if not source.exists(): 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) msg += list_directory(source_folder)
raise ClanError(msg) raise ClanError(msg)
group_folder.mkdir(parents=True, exist_ok=True) 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: def remove_member(group_folder: Path, name: str) -> None:
target = group_folder / name target = group_folder / name
if not target.exists(): 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) msg += list_directory(group_folder)
raise ClanError(msg) raise ClanError(msg)
os.remove(target) os.remove(target)

6
pkgs/clan-cli/clan_cli/secrets/secrets.py
View File

@@ -113,7 +113,7 @@ def groups_folder(group: str) -> Path:
def list_directory(directory: Path) -> str: def list_directory(directory: Path) -> str:
if not directory.exists(): if not directory.exists():
return "{directory} does not exist" return f"{directory} does not exist"
msg = f"\n{directory} contains:" msg = f"\n{directory} contains:"
for f in directory.iterdir(): for f in directory.iterdir():
msg += f"\n {f.name}" msg += f"\n {f.name}"
@@ -125,7 +125,7 @@ def allow_member(
) -> None: ) -> None:
source = source_folder / name source = source_folder / name
if not source.exists(): 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) msg += list_directory(source_folder)
raise ClanError(msg) raise ClanError(msg)
group_folder.mkdir(parents=True, exist_ok=True) group_folder.mkdir(parents=True, exist_ok=True)
@@ -148,7 +148,7 @@ def allow_member(
def disallow_member(group_folder: Path, name: str) -> None: def disallow_member(group_folder: Path, name: str) -> None:
target = group_folder / name target = group_folder / name
if not target.exists(): 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) msg += list_directory(group_folder)
raise ClanError(msg) raise ClanError(msg)