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

upgrade_client: Simplify error messages

Browse source
This commit is contained in:
deajan 2025-01-25 19:20:24 +01:00
parent 9bc932cd14
commit 1772f01db4
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
npbackup/upgrade_client/upgrader.py
View file

@ -218,7 +218,7 @@ def auto_upgrader(
if not file_info[file_type]: if not file_info[file_type]:
if file_type == "script": if file_type == "script":
logger.error( logger.error(
"No upgrade script found. We'll try to use the internal script" "No upgrade script found. We'll try to use the inline script"
) )
else: else:
logger.error(f"Cannot get file description for {file_type}") logger.error(f"Cannot get file description for {file_type}")
@ -231,7 +231,7 @@ def auto_upgrader(
logger.debug("Trace", exc_info=True) logger.debug("Trace", exc_info=True)
if file_type == "script": if file_type == "script":
logger.info( logger.info(
"No upgrade script found. We'll try to use the internal script" "Could not check for upgrade script. We'll try to use the inline script"
) )
else: else:
logger.error(f"Cannot get file description for {file_type}") logger.error(f"Cannot get file description for {file_type}")
@ -248,11 +248,7 @@ def auto_upgrader(
f"download/{file_type}/{target_id}", raw=True f"download/{file_type}/{target_id}", raw=True
) )
if not file_data[file_type]: if not file_data[file_type]:
if file_type == "script": if file_type != "script":
logger.info(
"No upgrade script found. We'll try to use the internal script"
)
else:
logger.error("Cannot get update file") logger.error("Cannot get update file")
return False return False
else: else:
@ -348,8 +344,12 @@ def auto_upgrader(
else: else:
cmd = f'bash "{file_info["script"]["local_fs_path"]}"' cmd = f'bash "{file_info["script"]["local_fs_path"]}"'
else: else:
logger.info("Using internal upgrade script") logger.info("Using inline upgrade script")
# By the way, why do we have an inline script ?
# it's harder to maintain, and isn't as flexible as a remote script
# but, some AV engines hate remote scripts, so we have to provide an inline script
# or we'll get flagged as malware
if os.name == "nt": if os.name == "nt":
cmd = ( cmd = (
f'echo "Launching upgrade" >> "{log_file}" 2>&1 & ' f'echo "Launching upgrade" >> "{log_file}" 2>&1 & '