gaschz/qubes-pass
1
0
Fork 0
mirror of https://github.com/gaschz/qubes-pass.git synced 2025-03-01 14:22:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Support multiline insertion again.

Browse Source
This commit is contained in:
Manuel Amador (Rudd-O) 2022-07-27 14:21:50 +00:00
parent 9c583a7cea
commit 5976cf7b2a
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/qvm-pass
View File

@ -328,7 +328,11 @@ def pass_manage(*args, **kwargs):
arguments = sys.argv[1:] arguments = sys.argv[1:]
if not "--help" in arguments and not "-h" in arguments and not "-?" in arguments: if "--help" in arguments or "-h" in arguments or "-?" in arguments:
parser_for_subcommands.parse_known_args(arguments)
sys.exit(os.EX_USAGE)
global_opts, args = parser_for_discrimination.parse_known_args(arguments) global_opts, args = parser_for_discrimination.parse_known_args(arguments)
if len(global_opts.arguments) == 0: if len(global_opts.arguments) == 0:
global_opts.arguments = ["ls"] + global_opts.arguments + args global_opts.arguments = ["ls"] + global_opts.arguments + args
@ -336,9 +340,8 @@ if not "--help" in arguments and not "-h" in arguments and not "-?" in arguments
len(global_opts.arguments) == 1 and global_opts.arguments[0] not in subcommands len(global_opts.arguments) == 1 and global_opts.arguments[0] not in subcommands
): ):
global_opts.arguments = ["show"] + global_opts.arguments + args global_opts.arguments = ["show"] + global_opts.arguments + args
else:
parser_for_subcommands.parse_known_args(arguments) arguments = global_opts.arguments + args
arguments = global_opts.arguments
opts = parser_for_subcommands.parse_args(arguments) opts = parser_for_subcommands.parse_args(arguments)
@ -353,7 +356,7 @@ if not global_opts.dest_vm:
"error: the QUBES_PASS_DOMAIN variable is not defined." "error: the QUBES_PASS_DOMAIN variable is not defined."
" Either create /rw/config/pass-split-domain with the VM containing" " Either create /rw/config/pass-split-domain with the VM containing"
" your pass setup, set the environment variable yourself," " your pass setup, set the environment variable yourself,"
" or pass -d on the command line.", " or pass -d on the command line.\n",
) )
opts.dest_vm = global_opts.dest_vm opts.dest_vm = global_opts.dest_vm