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

dom0/core: fix the last merge...

Browse Source 
Remove duplicated lines by faulty conflict resolution.
This commit is contained in:
Marek Marczykowski 2012-06-28 12:28:14 +02:00
parent 50dc086682
commit 2854f08bca
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dom0/qvm-core/qubes.py
View File

@ -2817,7 +2817,6 @@ class QubesVmCollection(dict):
"uses_default_netvm", "label", "memory", "vcpus", "pcidevs", "uses_default_netvm", "label", "memory", "vcpus", "pcidevs",
"maxmem", "kernel", "uses_default_kernel", "kernelopts", "uses_default_kernelopts", "maxmem", "kernel", "uses_default_kernel", "kernelopts", "uses_default_kernelopts",
"mac", "services", "include_in_backups", "debug", "default_user", "qrexec_installed", "drive" ) "mac", "services", "include_in_backups", "debug", "default_user", "qrexec_installed", "drive" )
"mac", "services", "include_in_backups", "debug", "default_user" )
for attribute in common_attr_list: for attribute in common_attr_list:
kwargs[attribute] = element.get(attribute) kwargs[attribute] = element.get(attribute)

21
dom0/qvm-tools/qvm-prefs
View File

@ -325,27 +325,6 @@ def set_include_in_backups(vms, vm, args):
vm.include_in_backups = bool(eval(args[0].capitalize())) vm.include_in_backups = bool(eval(args[0].capitalize()))
return True return True
def set_debug(vms, vm, args):
if len (args) != 1:
print >> sys.stderr, "Missing value (True/False or on/off)!"
return False
if args[0].lower() == "on":
vm.debug = True
elif args[0].lower() == "off":
vm.debug = False
else:
vm.debug = bool(eval(args[0].capitalize()))
return True
def set_default_user(vms, vm, args):
if len (args) != 1:
print >> sys.stderr, "Missing user name!"
return False
vm.default_user = args[0]
return True
def set_qrexec_installed(vms, vm, args): def set_qrexec_installed(vms, vm, args):
if len (args) != 1: if len (args) != 1:
print >> sys.stderr, "Missing value (True/False)!" print >> sys.stderr, "Missing value (True/False)!"