mirror of
https://github.com/gaschz/qubes-pass.git
synced 2025-06-07 01:38:31 +02:00
Fix argument parsing again.
This commit is contained in:
parent
5cb1ca5dc1
commit
2d4413d3fe
@ -337,13 +337,14 @@ if not "--help" in arguments and not "-h" in arguments and not "-?" in arguments
|
|||||||
):
|
):
|
||||||
global_opts.arguments = ["show"] + global_opts.arguments
|
global_opts.arguments = ["show"] + global_opts.arguments
|
||||||
arguments = global_opts.arguments
|
arguments = global_opts.arguments
|
||||||
|
global_opts
|
||||||
opts = parser_for_subcommands.parse_args(arguments)
|
opts = parser_for_subcommands.parse_args(arguments)
|
||||||
|
|
||||||
|
|
||||||
if not opts.dest_vm:
|
if not global_opts.dest_vm:
|
||||||
try:
|
try:
|
||||||
with open("/rw/config/pass-split-domain") as domain:
|
with open("/rw/config/pass-split-domain") as domain:
|
||||||
opts.dest_vm = domain.readlines()[0].strip()
|
global_opts.dest_vm = domain.readlines()[0].strip()
|
||||||
except FileNotFoundError:
|
except FileNotFoundError:
|
||||||
pass
|
pass
|
||||||
if not opts.dest_vm:
|
if not opts.dest_vm:
|
||||||
@ -353,6 +354,7 @@ if not opts.dest_vm:
|
|||||||
" 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.",
|
||||||
)
|
)
|
||||||
|
opts.dest_vm = global_opts.dest_vm
|
||||||
|
|
||||||
if opts.subcommand == "ls" or (opts.subcommand == "show" and opts.key is None):
|
if opts.subcommand == "ls" or (opts.subcommand == "show" and opts.key is None):
|
||||||
# User requested ls, or no argument, or show with no argument.
|
# User requested ls, or no argument, or show with no argument.
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
%define mybuildnumber %{?build_number}%{?!build_number:1}
|
%define mybuildnumber %{?build_number}%{?!build_number:1}
|
||||||
|
|
||||||
Name: qubes-pass
|
Name: qubes-pass
|
||||||
Version: 0.0.26
|
Version: 0.0.27
|
||||||
Release: %{mybuildnumber}%{?dist}
|
Release: %{mybuildnumber}%{?dist}
|
||||||
Summary: Inter-VM pass password management for Qubes OS AppVMs and StandaloneVMs
|
Summary: Inter-VM pass password management for Qubes OS AppVMs and StandaloneVMs
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
Loading…
x
Reference in New Issue
Block a user