mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Thomas Waldmann 2016-01-30 00:39:25 +01:00
parent d6b43a7346
commit 8ec62d5e2e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
borg/helpers.py
View File

@ -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