upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

PR #150 - Merge branch 'normalize_paths' of https://github.com/wavexx/attic into merge

Browse source
This commit is contained in:
Thomas Waldmann 2015-03-06 22:35:16 +01:00
commit a5fe6160ba
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
attic/archiver.py
View file

@ -173,8 +173,9 @@ Type "Yes I am sure" if you understand this and want to continue.\n""")
self.print_error('%s: %s', path, e)
else:
for filename in sorted(entries):
entry_path = os.path.normpath(os.path.join(path, filename))
self._process(archive, cache, excludes, exclude_caches, skip_inodes,
os.path.join(path, filename), restrict_dev)
entry_path, restrict_dev)
elif stat.S_ISLNK(st.st_mode):
archive.process_symlink(path, st)
elif stat.S_ISFIFO(st.st_mode):

6
attic/helpers.py
View file

@ -228,7 +228,7 @@ class IncludePattern:
path match as well. A trailing slash makes no difference.
"""
def __init__(self, pattern):
self.pattern = pattern.rstrip(os.path.sep)+os.path.sep
self.pattern = os.path.normpath(pattern).rstrip(os.path.sep)+os.path.sep
def match(self, path):
return (path+os.path.sep).startswith(self.pattern)
@ -243,9 +243,9 @@ class ExcludePattern(IncludePattern):
"""
def __init__(self, pattern):
if pattern.endswith(os.path.sep):
self.pattern = pattern+'*'+os.path.sep
self.pattern = os.path.normpath(pattern).rstrip(os.path.sep)+os.path.sep+'*'+os.path.sep
else:
self.pattern = pattern+os.path.sep+'*'
self.pattern = os.path.normpath(pattern)+os.path.sep+'*'
# fnmatch and re.match both cache compiled regular expressions.
# Nevertheless, this is about 10 times faster.
self.regex = re.compile(translate(self.pattern))

19
attic/testsuite/archiver.py
View file

@ -217,6 +217,25 @@ class ArchiverTestCase(ArchiverTestCaseBase):
self.assert_not_in('..', output)
self.assert_in(' input/dir1/dir2/file', output)
def test_exclude_normalization(self):
self.attic('init', self.repository_location)
self.create_regular_file('file1', size=1024 * 80)
self.create_regular_file('file2', size=1024 * 80)
with changedir('input'):
self.attic('create', '--exclude=file1', self.repository_location + '::test1', '.')
with changedir('output'):
self.attic('extract', self.repository_location + '::test1')
self.assert_equal(sorted(os.listdir('output')), ['file2'])
with changedir('input'):
self.attic('create', '--exclude=./file1', self.repository_location + '::test2', '.')
with changedir('output'):
self.attic('extract', self.repository_location + '::test2')
self.assert_equal(sorted(os.listdir('output')), ['file2'])
self.attic('create', '--exclude=input/./file1', self.repository_location + '::test3', 'input')
with changedir('output'):
self.attic('extract', self.repository_location + '::test3')
self.assert_equal(sorted(os.listdir('output/input')), ['file2'])
def test_repeated_files(self):
self.create_regular_file('file1', size=1024 * 80)
self.attic('init', self.repository_location)