Skip to content

Commit

Permalink
pick correct base when max_inc_per_full is used. Bump version
Browse files Browse the repository at this point in the history
  • Loading branch information
rdelcorro committed Jan 17, 2024
1 parent 3679174 commit 805ee92
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion zfs_uploader/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = '0.9.0'
__version__ = '0.10.0'

BACKUP_DB_FILE = 'backup.db'
DATETIME_FORMAT = '%Y%m%d_%H%M%S'
6 changes: 3 additions & 3 deletions zfs_uploader/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,15 +211,15 @@ def start(self):

# if we want incremental backups and multiple full backups
elif self._max_incremental_backups_per_full:
backup_time = backup.backup_time
full_backup_time = backup.backup_time

dependants = [True if b.dependency == backup_time
dependants = [True if b.dependency == full_backup_time
else False for b in backups_inc]

if sum(dependants) >= self._max_incremental_backups_per_full:
self._backup_full()
else:
self._backup_incremental(backup_time)
self._backup_incremental(incremental_or_full.backup_time)

# if we want incremental backups and not multiple full backups
else:
Expand Down

0 comments on commit 805ee92

Please sign in to comment.