From 4f62eb5320323d4f4de83b2af306ae53e89bc5ba Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sat, 2 Dec 2017 16:44:47 +0100 Subject: [PATCH] Fix upgrade fake package --- data/helpers.d/package | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/data/helpers.d/package b/data/helpers.d/package index 36777aa52..f28691579 100644 --- a/data/helpers.d/package +++ b/data/helpers.d/package @@ -126,10 +126,7 @@ ynh_install_app_dependencies () { version=$(grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4) # Retrieve the version number in the manifest file. dep_app=${app//_/-} # Replace all '_' by '-' - if ynh_package_is_installed "${dep_app}-ynh-deps"; then - echo "A package named ${dep_app}-ynh-deps is already installed" >&2 - else - cat > /tmp/${dep_app}-ynh-deps.control << EOF # Make a control file for equivs-build + cat > /tmp/${dep_app}-ynh-deps.control << EOF # Make a control file for equivs-build Section: misc Priority: optional Package: ${dep_app}-ynh-deps @@ -139,11 +136,10 @@ Architecture: all Description: Fake package for ${app} (YunoHost app) dependencies This meta-package is only responsible of installing its dependencies. EOF - ynh_package_install_from_equivs /tmp/${dep_app}-ynh-deps.control \ - || ynh_die "Unable to install dependencies" # Install the fake package and its dependencies - rm /tmp/${dep_app}-ynh-deps.control - ynh_app_setting_set $app apt_dependencies $dependencies - fi + ynh_package_install_from_equivs /tmp/${dep_app}-ynh-deps.control \ + || ynh_die "Unable to install dependencies" # Install the fake package and its dependencies + rm /tmp/${dep_app}-ynh-deps.control + ynh_app_setting_set $app apt_dependencies $dependencies } # Remove fake package and its dependencies