CondorCORE/condorcore-keyring
CondorCORE/condorcore-keyring
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(keyringctl): throw exception instead of exit on failed system calls

Browse Source
This commit is contained in:
Levente Polyak 2021-10-21 21:05:03 +02:00
parent f6e3a4e94b
commit 1a8ea8397d
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
keyringctl
View File

@ -107,7 +107,7 @@ def natural_sort_path(_list: Iterable[Path]) -> Iterable[Path]:
return sorted(_list, key=alphanum_key) return sorted(_list, key=alphanum_key)
def system(cmd: List[str], exit_on_error: bool = True) -> str: def system(cmd: List[str], exit_on_error: bool = False) -> str:
"""Execute a command using check_output """Execute a command using check_output
Parameters Parameters
@ -115,7 +115,7 @@ def system(cmd: List[str], exit_on_error: bool = True) -> str:
cmd: List[str] cmd: List[str]
A list of strings to be fed to check_output A list of strings to be fed to check_output
exit_on_error: bool exit_on_error: bool
Whether to exit the script when encountering an error (defaults to True) Whether to exit the script when encountering an error (defaults to False)
Raises Raises
------ ------
@ -668,7 +668,7 @@ def keyring_merge(certificates: List[Path], output: Optional[Path] = None, force
cmd += ["--output", str(output)] cmd += ["--output", str(output)]
cmd += [str(cert) for cert in sorted(certificates)] cmd += [str(cert) for cert in sorted(certificates)]
return system(cmd, exit_on_error=False) return system(cmd)
def packet_split(working_dir: Path, certificate: Path) -> Iterable[Path]: def packet_split(working_dir: Path, certificate: Path) -> Iterable[Path]:
@ -720,7 +720,7 @@ def packet_join(packets: List[Path], output: Optional[Path] = None, force: bool
packets_str = list(map(lambda path: str(path), packets)) packets_str = list(map(lambda path: str(path), packets))
cmd.extend(packets_str) cmd.extend(packets_str)
cmd.extend(["--output", str(output)]) cmd.extend(["--output", str(output)])
return system(cmd, exit_on_error=False) return system(cmd)
def simplify_user_id(user_id: Uid) -> Uid: def simplify_user_id(user_id: Uid) -> Uid: