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

Merge pull request #615 from ThomasWaldmann/fix-trailing-slashes 

use os.path.normpath on repository paths, fixes #606
This commit is contained in:
TW 2016-01-30 20:07:57 +01:00
parent 9797ab0130 8ec62d5e2e
commit 49cf25fce7
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.host = m.group('host')
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')
return True
m = self.file_re.match(text)
if m:
self.proto = m.group('proto')
self.path = m.group('path')
self.path = os.path.normpath(m.group('path'))
self.archive = m.group('archive')
return True
m = self.scp_re.match(text)
if m:
self.user = m.group('user')
self.host = m.group('host')
self.path = m.group('path')
self.path = os.path.normpath(m.group('path'))
self.archive = m.group('archive')
self.proto = self.host and 'ssh' or 'file'
return True