projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
add parental control (still somehow buggy and some minor features missing... don...
[vuplus_dvbapp]
/
lib
/
python
/
Tools
/
Directories.py
diff --git
a/lib/python/Tools/Directories.py
b/lib/python/Tools/Directories.py
index
7c50bd9
..
f7be953
100644
(file)
--- a/
lib/python/Tools/Directories.py
+++ b/
lib/python/Tools/Directories.py
@@
-46,7
+46,7
@@
def resolveFilename(scope, base = "", path_prefix = None):
if base[0:2] == "~/":
# you can only use the ~/ if we have a prefix directory
assert path_prefix is not None
- base =
path_prefix + base[2:]
+ base =
os.path.join(path_prefix, base[2:])
# don't resolve absolute paths
if base[0:1] == '/':