diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-11-23 14:01:44 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-23 14:01:44 +0100 |
| commit | c4d7f98e70694e471409cda6de03d0f3b5816f27 (patch) | |
| tree | 8cae9b3d3b6ee59a5a11da6f8702fc1ee2b1861a /lib/python/Screens/Setup.py | |
| parent | 7b2960a205f3c3e3b421d1664cd38644b3ffb679 (diff) | |
| parent | ed472ea627a958bc8dfb375ca03329624f1aed9c (diff) | |
| download | enigma2-c4d7f98e70694e471409cda6de03d0f3b5816f27.tar.gz enigma2-c4d7f98e70694e471409cda6de03d0f3b5816f27.zip | |
Merge branch 'obi/master'
Diffstat (limited to 'lib/python/Screens/Setup.py')
| -rwxr-xr-x | lib/python/Screens/Setup.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/python/Screens/Setup.py b/lib/python/Screens/Setup.py index e9c3c680..61e6fdd7 100755 --- a/lib/python/Screens/Setup.py +++ b/lib/python/Screens/Setup.py @@ -4,6 +4,7 @@ from Components.config import config, ConfigNothing from Components.SystemInfo import SystemInfo from Components.ConfigList import ConfigListScreen from Components.Sources.StaticText import StaticText +from enigma import eEnv import xml.etree.cElementTree @@ -14,7 +15,7 @@ try: setupfile = file('data/setup.xml', 'r') except: # if not found in the current path, we use the global datadir-path - setupfile = file('/usr/share/enigma2/setup.xml', 'r') + setupfile = file(eEnv.resolve('${datadir}/enigma2/setup.xml'), 'r') setupdom = xml.etree.cElementTree.parse(setupfile) setupfile.close() |