gryf/fs-uae-wrapper
1
0
Fork 0
mirror of https://github.com/gryf/fs-uae-wrapper.git synced 2025-12-19 04:20:23 +01:00
Code Issues Projects Releases Wiki Activity

Fix for config options containing HOME variable

Browse Source
This commit is contained in:
gryf
2017-01-08 15:37:29 +01:00
parent 152446abbe
commit 83185011aa
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fs_uae_wrapper/base.py
View File

@@ -208,6 +208,9 @@ class Base(object):
if val.startswith('/'): if val.startswith('/'):
continue continue
if val.startswith('$HOME'):
continue
if val.startswith('$CONFIG'): if val.startswith('$CONFIG'):
abspath = os.path.abspath(val.replace('$CONFIG', conf_abs_dir)) abspath = os.path.abspath(val.replace('$CONFIG', conf_abs_dir))
changed_options[key] = abspath changed_options[key] = abspath

5
tests/test_base.py
View File

@@ -75,6 +75,11 @@ class TestBase(TestCase):
bobj._normalize_options() bobj._normalize_options()
self.assertDictEqual(bobj.fsuae_options, {'cdroms_dir': result}) self.assertDictEqual(bobj.fsuae_options, {'cdroms_dir': result})
get_config.return_value = {'cdroms_dir': '$HOME/path'}
bobj.fsuae_options = utils.CmdOption()
bobj._normalize_options()
self.assertDictEqual(bobj.fsuae_options, {})
def test_set_assets_paths(self): def test_set_assets_paths(self):
bobj = base.Base('Config.fs-uae', utils.CmdOption(), {}) bobj = base.Base('Config.fs-uae', utils.CmdOption(), {})