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

tools/qvm-prefs: handle invalid properties by catching AttributeError

Browse Source 
This may avoid unneded qubesd call (listing properties).
This commit is contained in:
Marek Marczykowski-Górecki 2017-03-09 01:39:55 +01:00
parent e4c2294ce0
commit 4ffd44da49
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubesmgmt/tools/qvm_prefs.py
View File

@ -98,21 +98,24 @@ def process_actions(parser, args, target):
else: else:
args.property = args.property.replace('-', '_') args.property = args.property.replace('-', '_')
if args.property not in [prop.__name__
for prop in target.property_list()]:
parser.error('no such property: {!r}'.format(args.property))
if args.value is not None: if args.value is not None:
try:
setattr(target, args.property, args.value) setattr(target, args.property, args.value)
args.app.save() except AttributeError:
parser.error('no such property: {!r}'.format(args.property))
return 0 return 0
if args.delete: if args.delete:
try:
delattr(target, args.property) delattr(target, args.property)
args.app.save() except AttributeError:
parser.error('no such property: {!r}'.format(args.property))
return 0 return 0
try:
print(str(getattr(target, args.property))) print(str(getattr(target, args.property)))
except AttributeError:
parser.error('no such property: {!r}'.format(args.property))
return 0 return 0