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

Workaround for backup binary not being executable

Browse source
This commit is contained in:
Orsiris de Jong 2023-03-25 14:39:48 +01:00
parent 6459eb34f7
commit 10acca45af
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
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-2023 NetInvent" __copyright__ = "Copyright (C) 2022-2023 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2023030701" __build__ = "2023032501"
__version__ = "1.5.1" __version__ = "1.5.2"
from typing import Tuple, List, Optional, Callable, Union from typing import Tuple, List, Optional, Callable, Union
@ -75,6 +75,8 @@ class ResticRunner:
self._executor_finished = False # Internal value to check whether executor is done, accessed via self.executor_finished property self._executor_finished = False # Internal value to check whether executor is done, accessed via self.executor_finished property
self._stdout = None # Optional outputs when command is run as thread self._stdout = None # Optional outputs when command is run as thread
self.binary_is_executable = False
def on_exit(self) -> bool: def on_exit(self) -> bool:
self._executor_finished = True self._executor_finished = True
return self._executor_finished return self._executor_finished
@ -166,6 +168,16 @@ class ResticRunner:
def exec_time(self, value: int): def exec_time(self, value: int):
self._exec_time = value self._exec_time = value
def _make_binary_executable(self):
if self.binary_is_executable:
return True
try:
os.chmod(self._binary)
self.binary_is_executable = True
except OSError as exc:
logger.error("Cannot make \"{}\" executable: {}".format(self._binary, exc))
return False
def executor( def executor(
self, self,
cmd: str, cmd: str,
@ -178,6 +190,9 @@ class ResticRunner:
When using live_stream, we'll have command_runner fill stdout queue, which is useful for interactive GUI programs, but slower, especially for ls operation When using live_stream, we'll have command_runner fill stdout queue, which is useful for interactive GUI programs, but slower, especially for ls operation
""" """
# Make sure binary is executable first (workaround for https://github.com/Nuitka/Nuitka/issues/1656#issuecomment-1483819959)
self._make_binary_executable()
start_time = datetime.utcnow() start_time = datetime.utcnow()
self._executor_finished = False self._executor_finished = False
_cmd = '"{}" {}{}'.format(self._binary, cmd, self.generic_arguments) _cmd = '"{}" {}{}'.format(self._binary, cmd, self.generic_arguments)