Merge branch 'next' into 'master'

[bup.git] / lib / bup / helpers.py

diff --git a/lib/bup/helpers.py b/lib/bup/helpers.py
index ae3b1cbd8064e9c927201e961f23c181397e3bad..a5b12e091259cb5fb5b75e5230578f96a1e74651 100644 (file)
--- a/lib/bup/helpers.py
+++ b/lib/bup/helpers.py
@@ -422,9 +422,9 @@ def strip_path(prefix, path):
     if prefix == None:
         raise Exception('no path given')
 
-    normalized_prefix = realpath(prefix)
+    normalized_prefix = os.path.realpath(prefix)
     debug2("normalized_prefix: %s\n" % normalized_prefix)
-    normalized_path = realpath(path)
+    normalized_path = os.path.realpath(path)
     debug2("normalized_path: %s\n" % normalized_path)
     if normalized_path.startswith(normalized_prefix):
         return normalized_path[len(normalized_prefix):]
@@ -440,14 +440,15 @@ def strip_base_path(path, base_paths):
     Iterates over all base_paths from long to short, to prevent that
     a too short base_path is removed.
     """
+    normalized_path = os.path.realpath(path)
     sorted_base_paths = sorted(base_paths, key=len, reverse=True)
     for bp in sorted_base_paths:
-        if path.startswith(realpath(bp)):
-            return strip_path(bp, path)
+        if normalized_path.startswith(os.path.realpath(bp)):
+            return strip_path(bp, normalized_path)
     return path
 
 def graft_path(graft_points, path):
-    normalized_path = realpath(path)
+    normalized_path = os.path.realpath(path)
     for graft_point in graft_points:
         old_prefix, new_prefix = graft_point
         if normalized_path.startswith(old_prefix):