netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-02-24 14:35:36 +08:00
Code Issues Projects Releases Packages Wiki Activity

Minor linter fixes

Browse source
This commit is contained in:
Orsiris de Jong 2023-01-28 19:41:55 +01:00
parent 740857d759
commit d693b587c4
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
npbackup/restic_wrapper/__init__.py
View file

@ -168,7 +168,7 @@ class ResticRunner:
if exit_code == 0: if exit_code == 0:
self.last_command_status = True self.last_command_status = True
return True, output return True, output
elif exit_code == 3 and os.name == "nt": if exit_code == 3 and os.name == "nt":
# TEMP-FIX-4155, since we don't have reparse point support for Windows, see https://github.com/restic/restic/issues/4155, we have to filter manually for cloud errors which should not affect backup result # TEMP-FIX-4155, since we don't have reparse point support for Windows, see https://github.com/restic/restic/issues/4155, we have to filter manually for cloud errors which should not affect backup result
# exit_code = 3 when errors are present but snapshot could be created # exit_code = 3 when errors are present but snapshot could be created
# Since errors are always shown, we don't need restic --verbose option explicitly # Since errors are always shown, we don't need restic --verbose option explicitly
@ -176,7 +176,7 @@ class ResticRunner:
for line in output.split("\n"): for line in output.split("\n"):
if re.match("error", line, re.IGNORECASE): if re.match("error", line, re.IGNORECASE):
if re.match( if re.match(
".*: The cloud operation is not supported on a read-only volume\.|.*: The media is write protected\.", r".*: The cloud operation is not supported on a read-only volume\.|.*: The media is write protected\.",
line, line,
re.IGNORECASE, re.IGNORECASE,
): ):
@ -218,7 +218,7 @@ class ResticRunner:
for path in probe_paths: for path in probe_paths:
probed_path = os.path.join(path, binary) probed_path = os.path.join(path, binary)
logger.debug("Probing for binary in \"{}\"".format(probed_path)) logger.debug('Probing for binary in "{}"'.format(probed_path))
if os.path.isfile(probed_path): if os.path.isfile(probed_path):
self._binary = probed_path self._binary = probed_path
return return
@ -263,7 +263,7 @@ class ResticRunner:
if value > 0: if value > 0:
self._backend_connections = value self._backend_connections = value
except TypeError: except TypeError:
logger.warn("Bogus backend_connections value given.") logger.warning("Bogus backend_connections value given.")
@property @property
def additional_parameters(self): def additional_parameters(self):
@ -362,11 +362,11 @@ class ResticRunner:
def last_command_status(self, value: bool): def last_command_status(self, value: bool):
self._last_command_status = value self._last_command_status = value
def list(self, object: str = "snapshots") -> Optional[list]: def list(self, obj: str = "snapshots") -> Optional[list]:
""" """
Returns json list of snapshots Returns json list of snapshots
""" """
cmd = "list {} --json".format(object) cmd = "list {} --json".format(obj)
result, output = self.executor(cmd) result, output = self.executor(cmd)
if result: if result:
try: try:
@ -385,7 +385,7 @@ class ResticRunner:
if result and output: if result and output:
""" """
# When not using --json, we must remove first line since it will contain a heading string like: # When not using --json, we must remove first line since it will contain a heading string like:
# snapshot db125b40 of [C:\GIT\npbackup] filtered by [] at 2023-01-03 09:41:30.9104257 +0100 CET): # snapshot db125b40 of [C:\\GIT\\npbackup] filtered by [] at 2023-01-03 09:41:30.9104257 +0100 CET):
return output.split("\n", 2)[2] return output.split("\n", 2)[2]
Using --json here does not return actual json content, but lines with each file being a json... ! Using --json here does not return actual json content, but lines with each file being a json... !