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

qvm-prefs: fix validation of 'timezone' property

Browse Source 
This should be done in QubesVm class (property setter). But since we're
going to rewrite both qvm-prefs and QubesVm, settle on smaller change
for now.

QubesOS/qubes-issues#1184
This commit is contained in:
Marek Marczykowski-Górecki 2015-10-05 05:56:16 +02:00
parent d2617917be
commit 28cc933c4c
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qvm-tools/qvm-prefs
View File

@ -473,9 +473,12 @@ def set_timezone(vms, vm, args):
print >> sys.stderr, "Missing value ('localtime' or timeoffset in seconds)!" print >> sys.stderr, "Missing value ('localtime' or timeoffset in seconds)!"
return False return False
if not args[0].isdigit() and args[0].lower() == 'localtime': try:
print >> sys.stderr, "Invalid timezone value!" int(args[0])
return False except ValueError:
if args[0].lower() != 'localtime':
print >> sys.stderr, "Invalid timezone value!"
return False
vm.timezone = args[0] vm.timezone = args[0]
return True return True