netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-10-24 12:26:32 +08:00
Code Issues Projects Releases Packages Wiki Activity

Don't alter op result on json decode failure

Browse source
This commit is contained in:
Orsiris de Jong 2024-11-02 13:48:28 +01:00
parent b2c5140329
commit 726ab5ed93
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
npbackup/restic_wrapper/__init__.py
View file

@ -7,8 +7,8 @@ __intname__ = "npbackup.restic_wrapper"
__author__ = "Orsiris de Jong" __author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2022-2024 NetInvent" __copyright__ = "Copyright (C) 2022-2024 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2024101501" __build__ = "2024110201"
__version__ = "2.3.1" __version__ = "2.3.2"
from typing import Tuple, List, Optional, Callable, Union from typing import Tuple, List, Optional, Callable, Union
@ -739,7 +739,8 @@ class ResticRunner:
# self.write_logs(msg, level="error") # self.write_logs(msg, level="error")
# js["extended_info"] = msg # js["extended_info"] = msg
js["output"].append({"data": line}) js["output"].append({"data": line})
js["result"] = False # Don't alter result since restic might give non json result
# js["result"] = False
else: else:
try: try:
# pylint: disable=E0601 (used-before-assignment) # pylint: disable=E0601 (used-before-assignment)
@ -751,7 +752,7 @@ class ResticRunner:
# self.write_logs(msg, level="error") # self.write_logs(msg, level="error")
# js["extended_info"] = msg # js["extended_info"] = msg
js["output"].append({"data": line}) js["output"].append({"data": line})
js["result"] = False # js["result"] = False
# If we only have one output, we don't need a list # If we only have one output, we don't need a list
if len(js["output"]) == 1: if len(js["output"]) == 1:
js["output"] = js["output"][0] js["output"] = js["output"][0]