瀏覽代碼

use os.path.normpath on repository paths, fixes #606

this does NOT fix absolute vs. relative path usage,
but as this also deals with remote paths, this can't be done in general.
Thomas Waldmann 9 年之前
父節點
當前提交
8ec62d5e2e
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      borg/helpers.py

+ 3 - 3
borg/helpers.py

@@ -688,20 +688,20 @@ class Location:
             self.user = m.group('user')
             self.user = m.group('user')
             self.host = m.group('host')
             self.host = m.group('host')
             self.port = m.group('port') and int(m.group('port')) or None
             self.port = m.group('port') and int(m.group('port')) or None
-            self.path = m.group('path')
+            self.path = os.path.normpath(m.group('path'))
             self.archive = m.group('archive')
             self.archive = m.group('archive')
             return True
             return True
         m = self.file_re.match(text)
         m = self.file_re.match(text)
         if m:
         if m:
             self.proto = m.group('proto')
             self.proto = m.group('proto')
-            self.path = m.group('path')
+            self.path = os.path.normpath(m.group('path'))
             self.archive = m.group('archive')
             self.archive = m.group('archive')
             return True
             return True
         m = self.scp_re.match(text)
         m = self.scp_re.match(text)
         if m:
         if m:
             self.user = m.group('user')
             self.user = m.group('user')
             self.host = m.group('host')
             self.host = m.group('host')
-            self.path = m.group('path')
+            self.path = os.path.normpath(m.group('path'))
             self.archive = m.group('archive')
             self.archive = m.group('archive')
             self.proto = self.host and 'ssh' or 'file'
             self.proto = self.host and 'ssh' or 'file'
             return True
             return True