use os.path.join instead of string concat to fix trailing slash issue
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 16 Jun 2006 13:39:43 +0000 (13:39 +0000)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 16 Jun 2006 13:39:43 +0000 (13:39 +0000)
lib/python/Tools/Directories.py

index 7c50bd9fa2d2ed41828e2fb59b6555787ea0416d..f7be95359be7b26302269abfd44389de3183994c 100644 (file)
@@ -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
        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] == '/':
 
        # don't resolve absolute paths
        if base[0:1] == '/':