dom0: remove calls to not existing *_xen_storage methods in qvm-*
This commit is contained in:
parent
d11271df97
commit
973d79e932
@ -68,14 +68,6 @@ def main():
|
|||||||
qvm_collection.pop(vm.qid)
|
qvm_collection.pop(vm.qid)
|
||||||
exit (1)
|
exit (1)
|
||||||
|
|
||||||
try:
|
|
||||||
vm.add_to_xen_storage()
|
|
||||||
|
|
||||||
except (IOError, OSError) as err:
|
|
||||||
print "ERROR: {0}".format(err)
|
|
||||||
qvm_collection.pop(vm.qid)
|
|
||||||
exit (1)
|
|
||||||
|
|
||||||
qvm_collection.save()
|
qvm_collection.save()
|
||||||
qvm_collection.unlock_db()
|
qvm_collection.unlock_db()
|
||||||
|
|
||||||
|
@ -333,15 +333,6 @@ def main():
|
|||||||
host_collection.pop(vm.qid)
|
host_collection.pop(vm.qid)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
try:
|
|
||||||
vm.add_to_xen_storage()
|
|
||||||
|
|
||||||
except (IOError, OSError) as err:
|
|
||||||
print "ERROR: {0}".format(err)
|
|
||||||
print "*** Skiping VM: {0}".vm.name
|
|
||||||
host_collection.pop(vm.qid)
|
|
||||||
continue
|
|
||||||
|
|
||||||
# ... then appvms...
|
# ... then appvms...
|
||||||
for vm in [ vm for vm in vms_to_restore if vm.is_appvm()]:
|
for vm in [ vm for vm in vms_to_restore if vm.is_appvm()]:
|
||||||
|
|
||||||
@ -401,13 +392,6 @@ def main():
|
|||||||
host_collection.pop(vm.qid)
|
host_collection.pop(vm.qid)
|
||||||
continue
|
continue
|
||||||
|
|
||||||
try:
|
|
||||||
vm.add_to_xen_storage()
|
|
||||||
except (IOError, OSError) as err:
|
|
||||||
print "ERROR: {0}".format(err)
|
|
||||||
print "*** VM '{0}' will not boot until you manually fix it (or correctly restore this VM)!".format(vm.name)
|
|
||||||
|
|
||||||
|
|
||||||
backup_collection.unlock_db()
|
backup_collection.unlock_db()
|
||||||
host_collection.save()
|
host_collection.save()
|
||||||
host_collection.unlock_db()
|
host_collection.unlock_db()
|
||||||
|
@ -79,15 +79,6 @@ def main():
|
|||||||
print "This VM has been installed by RPM, use rpm -e <pkg name> to remove it!"
|
print "This VM has been installed by RPM, use rpm -e <pkg name> to remove it!"
|
||||||
exit (1)
|
exit (1)
|
||||||
|
|
||||||
try:
|
|
||||||
if options.verbose:
|
|
||||||
print "--> Removing from Xen Storage..."
|
|
||||||
vm.remove_from_xen_storage()
|
|
||||||
except (IOError, OSError) as err:
|
|
||||||
print "Warning: {0}".format(err)
|
|
||||||
# Do not exit, perhaps the VM was not in the Xen store
|
|
||||||
# so just remove it from Qubes DB
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
if vm.installed_by_rpm:
|
if vm.installed_by_rpm:
|
||||||
if options.verbose:
|
if options.verbose:
|
||||||
|
Loading…
Reference in New Issue
Block a user