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

fix(keyringctl): restore --target option for convert command

Browse Source
This commit is contained in:
Levente Polyak 2021-10-20 20:08:26 +02:00
parent 40592b3534
commit c214022300
No known key found for this signature in database
GPG Key ID: FC1B547C8D8172C8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
keyringctl
View File

@ -1132,7 +1132,7 @@ if __name__ == "__main__":
help="convert one or multiple PGP public keys to a decomposed directory structure", help="convert one or multiple PGP public keys to a decomposed directory structure",
) )
convert_parser.add_argument("source", type=absolute_path, help="File or directory to convert") convert_parser.add_argument("source", type=absolute_path, help="File or directory to convert")
convert_parser.add_argument("--target", type=absolute_path, help="target directory") convert_parser.add_argument("--target", type=absolute_path, help="Target directory instead of a random tmpdir")
convert_parser.add_argument( convert_parser.add_argument(
"--name", "--name",
type=Username, type=Username,
@ -1199,7 +1199,8 @@ if __name__ == "__main__":
debug(f"Working directory: {working_dir}") debug(f"Working directory: {working_dir}")
with cwd(working_dir): with cwd(working_dir):
if "convert" == args.subcommand: if "convert" == args.subcommand:
print(convert(working_dir, args.source, target_dir=Path(mkdtemp(prefix="arch-keyringctl-")).absolute())) target_dir = args.target or Path(mkdtemp(prefix="arch-keyringctl-")).absolute()
print(convert(working_dir, args.source, target_dir=target_dir))
elif "import" == args.subcommand: elif "import" == args.subcommand:
target_dir = "main" if args.main else "packager" target_dir = "main" if args.main else "packager"
print( print(