From ffc0c8d22e46d3e0a288aa6248799e4c3b8aaf56 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 25 Oct 2022 02:28:44 +0200 Subject: [PATCH] [wip] Be able to readd a repo before postinstall --- share/actionsmap.yml | 8 ++------ src/__init__.py | 1 + src/repository.py | 6 ++++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/share/actionsmap.yml b/share/actionsmap.yml index 6797ec81f..7e004ab76 100644 --- a/share/actionsmap.yml +++ b/share/actionsmap.yml @@ -1377,9 +1377,7 @@ backup: --keep-within: help: Keep all archives within this time interval extra: - pattern: &pattern_interval - - !!str ^\d+[Hdw]$ - - "pattern_interval" + pattern: *pattern_interval ### backup_timer_update() update: @@ -1429,9 +1427,7 @@ backup: --keep-within: help: Keep all archives within this time interval extra: - pattern: &pattern_interval - - !!str ^\d+[Hdw]$ - - "pattern_interval" + pattern: *pattern_interval ### backup_timer_remove() remove: diff --git a/src/__init__.py b/src/__init__.py index af18e1fe4..44f71654a 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -76,6 +76,7 @@ def check_command_is_valid_before_postinstall(args): "tools postinstall", "tools versions", "tools shell", + "backup repository", "backup list", "backup restore", "log display", diff --git a/src/repository.py b/src/repository.py index 2ee176263..55c19a245 100644 --- a/src/repository.py +++ b/src/repository.py @@ -115,8 +115,10 @@ class BackupRepository(ConfigPanel): return full_repositories def __init__(self, entity, config_path=None, save_path=None, creation=False): - if self.entity is None: - self.entity = settings_get("misc.backup.backup_default_repositories")[0] + + if entity is None: + entity = settings_get("misc.backup.backup_default_repositories")[0] + super().__init__(entity, config_path, save_path, creation) self._load_current_values()