From b8a65b61dd540e287d3b607fd8711c9250db0c5b Mon Sep 17 00:00:00 2001
From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 16 Jun 2006 13:39:43 +0000
Subject: [PATCH 1/1] use os.path.join instead of string concat to fix trailing
 slash issue

---
 lib/python/Tools/Directories.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 7c50bd9f..f7be9535 100644
--- 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] == '/':
-- 
2.30.2