diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-11-17 17:20:04 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-11-17 17:20:04 +0100 |
| commit | 2b49c99dcd77e5c65d9563b38ed25e3153144818 (patch) | |
| tree | 5cefbc8c84b91fbeef21e6b86c42c0e70f3fc121 /lib/python/Screens/Setup.py | |
| parent | a369ff24e35fce27bfc9fccf7b284b03533bb4c3 (diff) | |
| parent | a8682faafcab6004621a4848d7855c70b55f0bce (diff) | |
| download | enigma2-2b49c99dcd77e5c65d9563b38ed25e3153144818.tar.gz enigma2-2b49c99dcd77e5c65d9563b38ed25e3153144818.zip | |
Merge branch 'obi/master' into experimental
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() |