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 #1729 from YunoHost/extras_packages_from_raw_bash

Browse source 
Support packages_from_raw_bash in extra packages
This commit is contained in:
Alexandre Aubin 2023-10-30 18:51:51 +01:00 • committed by GitHub
commit 157f8c8121
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/utils/resources.py
View file

@ -1086,7 +1086,6 @@ class AptDependenciesAppResource(AppResource):
packages: List = [] packages: List = []
packages_from_raw_bash: str = "" packages_from_raw_bash: str = ""
extras: Dict[str, Dict[str, Union[str, List]]] = {} extras: Dict[str, Dict[str, Union[str, List]]] = {}
def __init__(self, properties: Dict[str, Any], *args, **kwargs): def __init__(self, properties: Dict[str, Any], *args, **kwargs):
super().__init__(properties, *args, **kwargs) super().__init__(properties, *args, **kwargs)
@ -1106,16 +1105,28 @@ class AptDependenciesAppResource(AppResource):
if isinstance(values.get("packages"), str): if isinstance(values.get("packages"), str):
values["packages"] = [value.strip() for value in values["packages"].split(",")] # type: ignore values["packages"] = [value.strip() for value in values["packages"].split(",")] # type: ignore
if isinstance(values.get("packages_from_raw_bash"), str):
out, err = self.check_output_bash_snippet(values.get("packages_from_raw_bash"))
if err:
logger.error(
f"Error while running apt resource packages_from_raw_bash snippet for '{key}' extras:"
)
logger.error(err)
values["packages"] = values.get("packages", []) + [value.strip() for value in out.split("\n")]
if ( if (
not isinstance(values.get("repo"), str) not isinstance(values.get("repo"), str)
or not isinstance(values.get("key"), str) or not isinstance(values.get("key"), str)
or not isinstance(values.get("packages"), list) or not isinstance(values.get("packages"), list)
): ):
raise YunohostError( raise YunohostError(
"In apt resource in the manifest: 'extras' repo should have the keys 'repo', 'key' defined as strings and 'packages' defined as list", "In apt resource in the manifest: 'extras' repo should have the keys 'repo', 'key' defined as strings, 'packages' defined as list or 'packages_from_raw_bash' defined as string",
raw_msg=True, raw_msg=True,
) )
# Drop 'extras' entries associated to no packages
self.extras = {key: value for key, values in self.extras.items() if values["packages"]}
def provision_or_update(self, context: Dict = {}): def provision_or_update(self, context: Dict = {}):
script = " ".join(["ynh_install_app_dependencies", *self.packages]) script = " ".join(["ynh_install_app_dependencies", *self.packages])
for repo, values in self.extras.items(): for repo, values in self.extras.items():