gryf/fs-uae-wrapper
1
0
Fork 0
mirror of https://github.com/gryf/fs-uae-wrapper.git synced 2026-01-23 07:25:48 +01:00
Code Issues Projects Releases Wiki Activity

Fix for interpolate_variables function

Browse Source
This commit is contained in:
gryf
2017-01-08 15:38:59 +01:00
parent 83185011aa
commit 388a8cc835
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs_uae_wrapper/base.py
View File

@@ -195,7 +195,6 @@ class Base(object):
for num in range(10):
include_list.append('hard_drive_%d' % num)
conf_abs_dir = os.path.dirname(os.path.abspath(self.conf_file))
changed_options = {}
for key, val in utils.get_config(self.conf_file).items():
@@ -212,7 +211,7 @@ class Base(object):
continue
if val.startswith('$CONFIG'):
abspath = os.path.abspath(val.replace('$CONFIG', conf_abs_dir))
abspath = utils.interpolate_variables(val, self.conf_file)
changed_options[key] = abspath
continue

5
fs_uae_wrapper/utils.py
View File

@@ -145,8 +145,9 @@ def interpolate_variables(string, config_path, base=None):
"""
if '$CONFIG' in string:
string = string.replace('$CONFIG',
os.path.dirname(os.path.abspath(config_path)))
conf_path = os.path.dirname(os.path.abspath(config_path))
string = os.path.abspath(string.replace('$CONFIG', conf_path))
if '$HOME' in string:
string = string.replace('$HOME', os.path.expandvars('$HOME'))