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

chore(keyringctl): deduplicate iteration and split code in convert()

Browse Source
This commit is contained in:
Levente Polyak 2021-10-12 19:42:22 +02:00
parent ac798eeeab
commit 6299f6416e
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
keyringctl
View File

@ -753,19 +753,13 @@ def convert(
""" """
directories: List[Path] = [] directories: List[Path] = []
if source.is_dir(): keys: Iterable[Path] = source.iterdir() if source.is_dir() else [source]
for key in source.iterdir():
name = name_override or key.stem for key in keys:
for cert in keyring_split(working_dir=working_dir, keyring=key): name = name_override or key.stem
directories.append( for cert in keyring_split(working_dir=working_dir, keyring=key):
convert_certificate(working_dir=working_dir, certificate=cert, name_override=name)
)
else:
name = name_override or source.stem
for cert in keyring_split(working_dir=working_dir, keyring=source):
directories.append( directories.append(
convert_certificate(working_dir=working_dir, certificate=cert, name_override=name) convert_certificate(working_dir=working_dir, certificate=cert, name_override=name))
)
for path in directories: for path in directories:
(target_dir / path.name).mkdir(exist_ok=True) (target_dir / path.name).mkdir(exist_ok=True)