mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
apt resource: fix handling of empty 'packages' list breaking dpkg-deb call
This commit is contained in:
parent
9f6f5f92fb
commit
3deffdbd57
1 changed files with 7 additions and 2 deletions
|
@ -1170,6 +1170,9 @@ class AptDependenciesAppResource(AppResource):
|
||||||
super().__init__(properties, *args, **kwargs)
|
super().__init__(properties, *args, **kwargs)
|
||||||
|
|
||||||
if isinstance(self.packages, str):
|
if isinstance(self.packages, str):
|
||||||
|
if self.packages.strip() == "":
|
||||||
|
self.packages = []
|
||||||
|
else:
|
||||||
self.packages = [value.strip() for value in self.packages.split(",")]
|
self.packages = [value.strip() for value in self.packages.split(",")]
|
||||||
|
|
||||||
if self.packages_from_raw_bash:
|
if self.packages_from_raw_bash:
|
||||||
|
@ -1224,7 +1227,9 @@ class AptDependenciesAppResource(AppResource):
|
||||||
"ynh_install_extra_app_dependencies"
|
"ynh_install_extra_app_dependencies"
|
||||||
)
|
)
|
||||||
|
|
||||||
script = " ".join([ynh_apt_install_dependencies, *self.packages])
|
script = ""
|
||||||
|
if self.packages:
|
||||||
|
script += " ".join([ynh_apt_install_dependencies, *self.packages])
|
||||||
for repo, values in self.extras.items():
|
for repo, values in self.extras.items():
|
||||||
script += "\n" + " ".join(
|
script += "\n" + " ".join(
|
||||||
[
|
[
|
||||||
|
|
Loading…
Add table
Reference in a new issue