From fa53264136b918f196cfa917227fe1476d472fe7 Mon Sep 17 00:00:00 2001 From: Houkime <> Date: Wed, 19 Jul 2023 10:51:36 +0000 Subject: [PATCH] refactor(backup):remove unused verify arg from do_restore --- selfprivacy_api/backup/backuppers/restic_backupper.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/selfprivacy_api/backup/backuppers/restic_backupper.py b/selfprivacy_api/backup/backuppers/restic_backupper.py index e04eaaf..fa7b2ee 100644 --- a/selfprivacy_api/backup/backuppers/restic_backupper.py +++ b/selfprivacy_api/backup/backuppers/restic_backupper.py @@ -225,7 +225,7 @@ class ResticBackupper(AbstractBackupper): with tempfile.TemporaryDirectory() as dir: if verify: - self.do_restore(snapshot_id, target=dir, verify=verify) + self._raw_verified_restore(snapshot_id, target=dir) snapshot_root = dir else: # attempting inplace restore via mount + sync self.mount_repo(dir) @@ -244,16 +244,11 @@ class ResticBackupper(AbstractBackupper): if not verify: self.unmount_repo(dir) - def do_restore(self, snapshot_id, target="/", verify=False): + def _raw_verified_restore(self, snapshot_id, target="/"): """barebones restic restore""" restore_command = self.restic_command( - "restore", - snapshot_id, - "--target", - target, + "restore", snapshot_id, "--target", target, "--verify" ) - if verify: - restore_command.append("--verify") with subprocess.Popen( restore_command, stdout=subprocess.PIPE, shell=False