Merge cc5e06ec15
into d104e6db99
This commit is contained in:
commit
0f8f167f19
|
@ -80,7 +80,7 @@ def clean_vm_name(vm_name):
|
|||
parts = vm_name.split('\x00')
|
||||
if parts[0].endswith('kvm'):
|
||||
try:
|
||||
return parts[parts.index('-name') + 1]
|
||||
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name') + 1])
|
||||
except ValueError:
|
||||
pass
|
||||
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)
|
||||
|
|
|
@ -79,7 +79,7 @@ def clean_vm_name(vm_name):
|
|||
parts = vm_name.split('\x00')
|
||||
if (parts[0].endswith('kvm')):
|
||||
try:
|
||||
vm_name = parts[parts.index('-name') + 1]
|
||||
vm_name = re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name') + 1])
|
||||
except ValueError:
|
||||
pass
|
||||
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)
|
||||
|
|
|
@ -48,7 +48,7 @@ def clean_vm_name(vm_name):
|
|||
parts = vm_name.split('\x00')
|
||||
if (parts[0].endswith('kvm')):
|
||||
try:
|
||||
return parts[parts.index('-name')+1]
|
||||
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name')+1])
|
||||
except ValueError:
|
||||
pass
|
||||
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)
|
||||
|
|
|
@ -103,7 +103,7 @@ def clean_vm_name(vm_name):
|
|||
parts = vm_name.split('\x00')
|
||||
if (parts[0].endswith('kvm')):
|
||||
try:
|
||||
return parts[parts.index('-name')+1]
|
||||
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", parts[parts.index('-name')+1])
|
||||
except ValueError:
|
||||
pass
|
||||
return re.sub(r"(^[^A-Za-z_]|[^A-Za-z0-9_])", "_", vm_name)
|
||||
|
|
Loading…
Reference in New Issue