Qubes/core-admin-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tools: fix handling single optional VM name

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-18 09:50:25 +02:00
parent ee81902979
commit 7f5fc6ac3d
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qubesadmin/tools/__init__.py
View File

@ -163,11 +163,19 @@ class VmNameAction(QubesAction):
if hasattr(namespace, 'exclude') and namespace.exclude: if hasattr(namespace, 'exclude') and namespace.exclude:
parser.error('--exclude can only be used with --all') parser.error('--exclude can only be used with --all')
for vm_name in getattr(namespace, self.dest): if self.nargs == argparse.OPTIONAL:
try: vm_name = getattr(namespace, self.dest, None)
namespace.domains += [app.domains[vm_name]] if vm_name is not None:
except KeyError: try:
parser.error('no such domain: {!r}'.format(vm_name)) namespace.domains += [app.domains[vm_name]]
except KeyError:
parser.error('no such domain: {!r}'.format(vm_name))
else:
for vm_name in getattr(namespace, self.dest):
try:
namespace.domains += [app.domains[vm_name]]
except KeyError:
parser.error('no such domain: {!r}'.format(vm_name))
class RunningVmNameAction(VmNameAction): class RunningVmNameAction(VmNameAction):