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

Use relative path in system_path dict instead of path templates

Browse Source 
This will allow use of correct slashes/backslashes (os.path.join instead
of hardcoded '/').
This commit is contained in:
Marek Marczykowski-Górecki 2013-07-30 11:37:33 +02:00
parent a17f6ef779
commit 50188c8832
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/qubes.py
View File

@ -57,11 +57,12 @@ system_path = {
'qubes_base_dir': qubes_base_dir, 'qubes_base_dir': qubes_base_dir,
'qubes_appvms_dir': '{base_dir}/appvms', # Relative to qubes_base_dir
'qubes_templates_dir': '{base_dir}/vm-templates', 'qubes_appvms_dir': 'appvms',
'qubes_servicevms_dir': '{base_dir}/servicevms', 'qubes_templates_dir': 'vm-templates',
'qubes_store_filename': '{base_dir}/qubes.xml', 'qubes_servicevms_dir': 'servicevms',
'qubes_kernels_base_dir': '{base_dir}/vm-kernels', 'qubes_store_filename': 'qubes.xml',
'qubes_kernels_base_dir': 'vm-kernels',
# qubes_icon_dir is obsolete # qubes_icon_dir is obsolete
# use QIcon.fromTheme() where applicable # use QIcon.fromTheme() where applicable
@ -881,8 +882,8 @@ except ImportError:
pass pass
for path_key in system_path.keys(): for path_key in system_path.keys():
system_path[path_key] = system_path[path_key].format( if not os.path.isabs(system_path[path_key]):
base_dir=system_path['qubes_base_dir'] system_path[path_key] = os.path.join(
) system_path['qubes_base_dir'], system_path[path_key])
# vim:sw=4:et: # vim:sw=4:et: