mirror of https://github.com/borgbackup/borg.git
Merge pull request #615 from ThomasWaldmann/fix-trailing-slashes
use os.path.normpath on repository paths, fixes #606
This commit is contained in:
commit
49cf25fce7
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue