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

🎨 Format Python code with Black

Browse source
This commit is contained in:
alexAubin 2024-06-20 17:07:42 +00:00 • committed by github-actions[bot]
parent 2ee8d93f67
commit b1b3c6eff8
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/utils/resources.py
View file

@ -157,10 +157,22 @@ class AppResource:
# FIXME : should use packaging.version to properly parse / compare versions >_> # FIXME : should use packaging.version to properly parse / compare versions >_>
self.helpers_version = None self.helpers_version = None
if manager and manager.wanted and manager.wanted.get("integration", {}).get("helpers_version"): if (
self.helpers_version = manager.wanted.get("integration", {}).get("helpers_version") manager
elif manager and manager.current and manager.current.get("integration", {}).get("helpers_version"): and manager.wanted
self.helpers_version = manager.current.get("integration", {}).get("helpers_version") and manager.wanted.get("integration", {}).get("helpers_version")
):
self.helpers_version = manager.wanted.get("integration", {}).get(
"helpers_version"
)
elif (
manager
and manager.current
and manager.current.get("integration", {}).get("helpers_version")
):
self.helpers_version = manager.current.get("integration", {}).get(
"helpers_version"
)
elif manager and manager.wanted and manager.wanted.get("packaging_format"): elif manager and manager.wanted and manager.wanted.get("packaging_format"):
self.helpers_version = str(manager.wanted.get("packaging_format")) self.helpers_version = str(manager.wanted.get("packaging_format"))
elif manager and manager.current and manager.current.get("packaging_format"): elif manager and manager.current and manager.current.get("packaging_format"):
@ -1198,10 +1210,14 @@ class AptDependenciesAppResource(AppResource):
if float(self.helpers_version) >= 2.1: if float(self.helpers_version) >= 2.1:
ynh_apt_install_dependencies = "ynh_apt_install_dependencies" ynh_apt_install_dependencies = "ynh_apt_install_dependencies"
ynh_apt_install_dependencies_from_extra_repository = "ynh_apt_install_dependencies_from_extra_repository" ynh_apt_install_dependencies_from_extra_repository = (
"ynh_apt_install_dependencies_from_extra_repository"
)
else: else:
ynh_apt_install_dependencies = "ynh_install_app_dependencies" ynh_apt_install_dependencies = "ynh_install_app_dependencies"
ynh_apt_install_dependencies_from_extra_repository = "ynh_install_extra_app_dependencies" ynh_apt_install_dependencies_from_extra_repository = (
"ynh_install_extra_app_dependencies"
)
script = " ".join([ynh_apt_install_dependencies, *self.packages]) script = " ".join([ynh_apt_install_dependencies, *self.packages])
for repo, values in self.extras.items(): for repo, values in self.extras.items():
@ -1488,10 +1504,11 @@ class DatabaseAppResource(AppResource):
raise RuntimeError(f"Invalid dbtype {self.dbtype}") raise RuntimeError(f"Invalid dbtype {self.dbtype}")
self._run_script( self._run_script(
"deprovision", f""" "deprovision",
f"""
ynh_{db_helper_name}_database_exists "{db_name}" && ynh_{db_helper_name}_drop_db "{db_name}" || true ynh_{db_helper_name}_database_exists "{db_name}" && ynh_{db_helper_name}_drop_db "{db_name}" || true
ynh_{db_helper_name}_user_exists "{db_user}" && ynh_{db_helper_name}_drop_user "{db_user}" || true ynh_{db_helper_name}_user_exists "{db_user}" && ynh_{db_helper_name}_drop_user "{db_user}" || true
""" """,
) )
self.delete_setting("db_name") self.delete_setting("db_name")