netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2025-09-06 04:54:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

WIP: Fixes for macos

Browse source
This commit is contained in:
deajan 2025-07-01 15:12:59 +02:00
parent 098fc4c401
commit ae4c9f1c94
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RESTIC_SOURCE_FILES/update_restic.py
View file

@ -137,6 +137,9 @@ def download_restic_binaries_for_arch():
if os.name == "nt": if os.name == "nt":
if not download_restic_binaries("amd64") or not download_restic_binaries("386"): if not download_restic_binaries("amd64") or not download_restic_binaries("386"):
sys.exit(1) sys.exit(1)
elif sys.platform.lower() == "darwin":
if not download_restic_binaries("arm64") or not download_restic_binaries("amd64"):
sys.exit(1)
else: else:
if ( if (
not download_restic_binaries("amd64") not download_restic_binaries("amd64")

8
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-2025 NetInvent" __copyright__ = "Copyright (C) 2022-2025 NetInvent"
__license__ = "GPL-3.0-only" __license__ = "GPL-3.0-only"
__build__ = "2025051101" __build__ = "2025070101"
__version__ = "2.7.1" __version__ = "2.7.2"
from typing import Tuple, List, Optional, Callable, Union from typing import Tuple, List, Optional, Callable, Union
@ -22,6 +22,7 @@ import queue
from command_runner import command_runner from command_runner import command_runner
from packaging.version import parse as version_parse from packaging.version import parse as version_parse
from ofunctions.misc import BytesConverter, fn_name from ofunctions.misc import BytesConverter, fn_name
from ofunctions.platform import get_os
from npbackup.__debug__ import _DEBUG from npbackup.__debug__ import _DEBUG
from npbackup.__env__ import ( from npbackup.__env__ import (
FAST_COMMANDS_TIMEOUT, FAST_COMMANDS_TIMEOUT,
@ -454,7 +455,8 @@ class ResticRunner:
live_output=self._live_output if method != "monitor" else False, live_output=self._live_output if method != "monitor" else False,
check_interval=CHECK_INTERVAL, check_interval=CHECK_INTERVAL,
priority=self._priority, priority=self._priority,
io_priority=self._priority, # psutil.Process().ionice() does not exist on MacOS
io_priority=self._priority if get_os() != "Darwin" else None,
windows_no_window=True, windows_no_window=True,
heartbeat=HEARTBEAT_INTERVAL, heartbeat=HEARTBEAT_INTERVAL,
) )