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

do not crash for empty archives list in borg rlist date based matching (#7544) 

fix ValueError for empty archives list, add a test

Signed-off-by: Chirag Aggarwal <thechiragaggarwal@gmail.com>
This commit is contained in:
jetchirag 2023-05-20 16:00:03 +05:30 committed by GitHub
parent ed2bc8a8e0
commit eeefa55428
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/borg/manifest.py
View File

@ -39,6 +39,9 @@ def filter_archives_by_date(archives, older=None, newer=None, oldest=None, newes
timestamps = [x.ts for x in archives_list]
return min(timestamps), max(timestamps)
if not archives:
return archives
now = archive_ts_now()
earliest_ts, latest_ts = get_first_and_last_archive_ts(archives)
@ -46,6 +49,9 @@ def filter_archives_by_date(archives, older=None, newer=None, oldest=None, newes
from_ts = calculate_relative_offset(newer, now, earlier=True) if newer is not None else earliest_ts
archives = [x for x in archives if from_ts <= x.ts <= until_ts]
if not archives:
return archives
earliest_ts, latest_ts = get_first_and_last_archive_ts(archives)
if oldest:
until_ts = calculate_relative_offset(oldest, earliest_ts, earlier=False)
@ -136,7 +142,7 @@ class Archives(abc.MutableMapping):
regex = re.compile(regex + match_end)
archives = [x for x in archives if regex.match(x.name) is not None]
if any([oldest, newest, older, newer]) and len(archives) > 0:
if any([oldest, newest, older, newer]):
archives = filter_archives_by_date(archives, oldest=oldest, newest=newest, newer=newer, older=older)
if not consider_checkpoints:
archives = [x for x in archives if ".checkpoint" not in x.name]

7
src/borg/testsuite/archiver/check_cmd.py
View File

@ -92,6 +92,13 @@ class ArchiverCheckTestCase(ArchiverTestCaseBase):
self.assert_in("archive2", output)
self.assert_not_in("archive3", output)
# check for output when timespan older than earliest archive is given. Issue #1711
output = self.cmd(
f"--repo={self.repository_location}", "check", "-v", "--archives-only", "--older=9999m", exit_code=0
)
for archive in ("archive1", "archive2", "archive3"):
self.assert_not_in(archive, output)
def test_missing_file_chunk(self):
archive, repository = self.open_archive("archive1")
with repository: