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

Reformat files with black

Browse source
This commit is contained in:
deajan 2024-09-07 18:49:42 +02:00
parent cbe34c4819
commit cbade449b2
4 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
npbackup/__main__.py
View file

@ -468,7 +468,9 @@ This is free software, and you are welcome to redistribute it under certain cond
logger.info("Running program initiated auto upgrade") logger.info("Running program initiated auto upgrade")
# Don't log upgrade check errors if we're in auto upgrade mode # Don't log upgrade check errors if we're in auto upgrade mode
# since it will change the whole exit code of the program # since it will change the whole exit code of the program
result = upgrade_runner.run_upgrade(full_config, ignore_errors=False if args.auto_upgrade else True) result = upgrade_runner.run_upgrade(
full_config, ignore_errors=False if args.auto_upgrade else True
)
if result: if result:
sys.exit(0) sys.exit(0)
elif args.auto_upgrade: elif args.auto_upgrade:

2
npbackup/core/runner.py
View file

@ -119,7 +119,7 @@ def metric_writer(
metrics.append( metrics.append(
f'npbackup_exec_state{{{labels},action="{operation}",repo_name="{repo_name}",timestamp="{int(datetime.now(timezone.utc).timestamp())}"}} {exec_state}' f'npbackup_exec_state{{{labels},action="{operation}",repo_name="{repo_name}",timestamp="{int(datetime.now(timezone.utc).timestamp())}"}} {exec_state}'
) )
# Add upgrade state if upgrades activated # Add upgrade state if upgrades activated
upgrade_state = os.environ.get("NPBACKUP_UPGRADE_STATE", None) upgrade_state = os.environ.get("NPBACKUP_UPGRADE_STATE", None)
try: try:

2
npbackup/core/upgrade_runner.py
View file

@ -119,6 +119,6 @@ def run_upgrade(full_config: dict, ignore_errors: bool = False) -> bool:
auto_upgrade_host_identity=auto_upgrade_host_identity, auto_upgrade_host_identity=auto_upgrade_host_identity,
installed_version=npbackup_version, installed_version=npbackup_version,
group=group, group=group,
ignore_errors=ignore_errors ignore_errors=ignore_errors,
) )
return result return result

10
npbackup/upgrade_client/upgrader.py
View file

@ -42,7 +42,9 @@ def sha256sum_data(data):
return sha256.hexdigest() return sha256.hexdigest()
def _check_new_version(upgrade_url: str, username: str, password: str, ignore_errors: bool = False) -> bool: def _check_new_version(
upgrade_url: str, username: str, password: str, ignore_errors: bool = False
) -> bool:
""" """
Check if we have a newer version of npbackup Check if we have a newer version of npbackup
""" """
@ -122,13 +124,15 @@ def auto_upgrader(
We must check that we run a compiled binary first We must check that we run a compiled binary first
We assume that we run a onefile nuitka binary We assume that we run a onefile nuitka binary
""" """
if not IS_COMPILED and False: #WIP if not IS_COMPILED and False: # WIP
logger.info( logger.info(
"Auto upgrade will only upgrade compiled verions. Please use 'pip install --upgrade npbackup' instead" "Auto upgrade will only upgrade compiled verions. Please use 'pip install --upgrade npbackup' instead"
) )
return False return False
res = _check_new_version(upgrade_url, username, password, ignore_errors=ignore_errors) res = _check_new_version(
upgrade_url, username, password, ignore_errors=ignore_errors
)
# Let's set a global environment variable which we can check later in metrics # Let's set a global environment variable which we can check later in metrics
os.environ["NPBACKUP_UPGRADE_STATE"] = "0" os.environ["NPBACKUP_UPGRADE_STATE"] = "0"
if not res: if not res: