Merge remote-tracking branch 'qubesos/pr/73'
* qubesos/pr/73: Fixed regexp for MAC address in qvm-prefs Fixes QubesOS/qubes-issues#1270
This commit is contained in:
commit
02d8f273f2
@ -196,7 +196,7 @@ def set_mac(vms, vm, args):
|
|||||||
print >> sys.stderr, "Missing MAC argument!"
|
print >> sys.stderr, "Missing MAC argument!"
|
||||||
return False
|
return False
|
||||||
|
|
||||||
if not re.match("[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}|auto", args[0]):
|
if not re.match("[0-9a-fA-F]{2}(:[0-9a-fA-F]{2}){5}$|auto$", args[0]):
|
||||||
print >> sys.stderr, "Invalid MAC argument!"
|
print >> sys.stderr, "Invalid MAC argument!"
|
||||||
print >> sys.stderr, "Possible values:"
|
print >> sys.stderr, "Possible values:"
|
||||||
print >> sys.stderr, "1) auto"
|
print >> sys.stderr, "1) auto"
|
||||||
|
Loading…
Reference in New Issue
Block a user