YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1584 from YunoHost/ci-format-dev

Browse source 
[CI] Format code with Black
This commit is contained in:
Alexandre Aubin 2023-02-02 23:45:05 +01:00 • committed by GitHub
commit cdae5ad111
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/app.py
View file

@ -647,7 +647,9 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False
safety_backup_name = f"{app_instance_name}-pre-upgrade2" safety_backup_name = f"{app_instance_name}-pre-upgrade2"
other_safety_backup_name = f"{app_instance_name}-pre-upgrade1" other_safety_backup_name = f"{app_instance_name}-pre-upgrade1"
backup_create(name=safety_backup_name, apps=[app_instance_name], system=None) backup_create(
name=safety_backup_name, apps=[app_instance_name], system=None
)
if safety_backup_name in backup_list()["archives"]: if safety_backup_name in backup_list()["archives"]:
# if the backup suceeded, delete old safety backup to save space # if the backup suceeded, delete old safety backup to save space
@ -708,7 +710,10 @@ def app_upgrade(app=[], url=None, file=None, force=False, no_safety_backup=False
# so we need to reflect this in the env_dict used to call the actual upgrade script x_x # so we need to reflect this in the env_dict used to call the actual upgrade script x_x
# Or: the old manifest may be in v1 and the new in v2, so force to add the setting in env # Or: the old manifest may be in v1 and the new in v2, so force to add the setting in env
env_dict = _make_environment_for_app_script( env_dict = _make_environment_for_app_script(
app_instance_name, workdir=extracted_app_folder, action="upgrade", include_app_settings=True, app_instance_name,
workdir=extracted_app_folder,
action="upgrade",
include_app_settings=True,
) )
env_dict.update(env_dict_more) env_dict.update(env_dict_more)
@ -2732,7 +2737,12 @@ def _assert_no_conflicting_apps(domain, path, ignore_app=None, full_domain=False
def _make_environment_for_app_script( def _make_environment_for_app_script(
app, args={}, args_prefix="APP_ARG_", workdir=None, action=None, include_app_settings=False, app,
args={},
args_prefix="APP_ARG_",
workdir=None,
action=None,
include_app_settings=False,
): ):
app_setting_path = os.path.join(APPS_SETTING_PATH, app) app_setting_path = os.path.join(APPS_SETTING_PATH, app)

4
src/log.py
View file

@ -601,7 +601,9 @@ class OperationLogger:
# all settings are included in the env but we probably don't want to dump all of these # all settings are included in the env but we probably don't want to dump all of these
# which may contain various secret/private data ... # which may contain various secret/private data ...
if "env" in metadata: if "env" in metadata:
metadata["env"] = {k: v for k, v in metadata["env"].items() if k == k.upper()} metadata["env"] = {
k: v for k, v in metadata["env"].items() if k == k.upper()
}
dump = yaml.safe_dump(self.metadata, default_flow_style=False) dump = yaml.safe_dump(self.metadata, default_flow_style=False)
for data in self.data_to_redact: for data in self.data_to_redact: