1.1 --- a/OpenSecurity/bin/opensecurityd.pyw	Thu May 22 16:01:28 2014 +0100
     1.2 +++ b/OpenSecurity/bin/opensecurityd.pyw	Fri May 23 15:04:52 2014 +0100
     1.3 @@ -145,10 +145,15 @@
     1.4          
     1.5          if gvm_mgr.vmRootName in gvm_mgr.listVM():
     1.6              gvm_mgr.poweroffVM(gvm_mgr.vmRootName)
     1.7 -            gvm_mgr.storageDetach(gvm_mgr.vmRootName)
     1.8 -            gvm_mgr.removeSnapshots(gvm_mgr.vmRootName)
     1.9 -            #TODO:// unregister vmdk with the vbox
    1.10 -            gvm_mgr.removeVMFolder(gvm_mgr.vmRootName)
    1.11 +            tmplateUUID = gvm_mgr.getTemplateUUID()
    1.12 +            if tmplateUUID != None:
    1.13 +                logger.debug('found parent uuid ' + tmplateUUID)
    1.14 +                gvm_mgr.storageDetach(gvm_mgr.vmRootName)
    1.15 +                gvm_mgr.removeSnapshots(tmplateUUID)
    1.16 +                gvm_mgr.removeImage(tmplateUUID)
    1.17 +            else:
    1.18 +                logger.debug('parent uuid not found')
    1.19 +            gvm_mgr.removeVM(gvm_mgr.vmRootName)
    1.20          
    1.21          trace_file_name = os.path.join(Environment('OpenSecurity').log_path, 'OpenSecurity_initial_import.log')
    1.22          trace_file = open(trace_file_name, 'w+')