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

Add legacy arch to upgrade client

Browse source
This commit is contained in:
deajan 2024-09-17 12:35:16 +02:00
parent 916c215c1f
commit a5de4f1f39
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
npbackup/path_helper.py
View file

@ -7,7 +7,7 @@ __intname__ = "npbackup.path_helper"
__author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2023-2024 NetInvent"
__license__ = "BSD-3-Clause"
__build__ = "2023012201"
__build__ = "2024091701"
# This file must exist at the root of the package, for basedir to be detected as root
@ -22,3 +22,6 @@ CURRENT_EXECUTABLE = os.path.abspath(sys.argv[0])
CURRENT_DIR = os.path.dirname(CURRENT_EXECUTABLE)
# When run with nuitka onefile, this will be the temp directory, else, this will be the path to current file
BASEDIR = os.path.abspath(os.path.dirname(os.path.realpath(__file__)))
# Python 3.7 versions are considered legacy since they don't support msgspec
IS_LEGACY = True if sys.version_info[1] < 8 else False

8
npbackup/upgrade_client/upgrader.py
View file

@ -7,7 +7,7 @@ __intname__ = "npbackup.upgrade_client.upgrader"
__author__ = "Orsiris de Jong"
__copyright__ = "Copyright (C) 2023-2024 NetInvent"
__license__ = "BSD-3-Clause"
__build__ = "2024090601"
__build__ = "2024091701"
import os
@ -22,7 +22,7 @@ from ofunctions.platform import get_os, python_arch
from ofunctions.process import kill_childs
from ofunctions.requestor import Requestor
from command_runner import deferred_command
from npbackup.path_helper import CURRENT_DIR, CURRENT_EXECUTABLE
from npbackup.path_helper import CURRENT_DIR, CURRENT_EXECUTABLE, IS_LEGACY
from npbackup.core.nuitka_helper import IS_COMPILED
from npbackup.__version__ import __version__ as npbackup_version
@ -124,7 +124,7 @@ def auto_upgrader(
We must check that we run a compiled binary first
We assume that we run a onefile nuitka binary
"""
if not IS_COMPILED and False: # WIP
if not IS_COMPILED:
logger.info(
"Auto upgrade will only upgrade compiled verions. Please use 'pip install --upgrade npbackup' instead"
)
@ -143,7 +143,7 @@ def auto_upgrader(
requestor.create_session(authenticated=True)
# We'll check python_arch instead of os_arch since we build 32 bit python executables for compat reasons
platform_and_arch = "{}/{}".format(get_os(), python_arch()).lower()
platform_and_arch = "{}/{}".format(get_os(), python_arch()).lower() + "-legacy" if IS_LEGACY else ""
try:
host_id = "{}/{}/{}".format(