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

Fix circular deps workaround in Pool.vmdir_path()

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2015-11-25 16:01:28 +01:00
parent 85421e3f48
commit f5cef35cdf
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/storage/__init__.py
View File

@ -382,22 +382,17 @@ class Pool(object):
string (str) absolute path to the directory where the vm files string (str) absolute path to the directory where the vm files
are stored are stored
""" """
# TODO: This is a hack, circular dependencies problem? if vm.is_appvm():
from qubes.qubes import (QubesAppVm, QubesDisposableVm, QubesHVm,
QubesNetVm, QubesTemplateHVm, QubesTemplateVm)
vm_type = type(vm)
if vm_type in [QubesAppVm, QubesHVm]:
subdir = 'appvms' subdir = 'appvms'
elif vm_type in [QubesTemplateVm, QubesTemplateHVm]: elif vm.is_template():
subdir = 'vm-templates' subdir = 'vm-templates'
elif issubclass(vm_type, QubesNetVm): elif vm.is_netvm():
subdir = 'servicevms' subdir = 'servicevms'
elif vm_type is QubesDisposableVm: elif vm.is_disposablevm():
subdir = 'appvms' subdir = 'appvms'
return os.path.join(pool_dir, subdir, vm.template.name + '-dvm') return os.path.join(pool_dir, subdir, vm.template.name + '-dvm')
else: else:
raise QubesException(str(vm_type) + ' unknown vm type') raise QubesException(vm.type() + ' unknown vm type')
return os.path.join(pool_dir, subdir, vm.name) return os.path.join(pool_dir, subdir, vm.name)