From 346728e55dbed915f9dbee68929a92cf70f1ffcf Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Fri, 28 Aug 2020 22:31:10 +0200 Subject: [PATCH] Remove the pinning stuff of sury from the helpers, since it's now managed by the regenconf core --- data/helpers.d/apt | 6 ------ data/helpers.d/php | 6 ------ 2 files changed, 12 deletions(-) diff --git a/data/helpers.d/apt b/data/helpers.d/apt index 377464786..1a4a9f74a 100644 --- a/data/helpers.d/apt +++ b/data/helpers.d/apt @@ -265,12 +265,6 @@ ynh_install_app_dependencies () { then # Re-add sury ynh_install_extra_repo --repo="https://packages.sury.org/php/ $(ynh_get_debian_release) main" --key="https://packages.sury.org/php/apt.gpg" --name=extra_php_version --priority=600 - - # Pin this sury repository to prevent sury of doing shit - for package_to_not_upgrade in "php" "php-fpm" "php-mysql" "php-xml" "php-zip" "php-mbstring" "php-ldap" "php-gd" "php-curl" "php-bz2" "php-json" "php-sqlite3" "php-intl" "openssl" "libssl1.1" "libssl-dev" - do - ynh_pin_repo --package="$package_to_not_upgrade" --pin="origin \"packages.sury.org\"" --priority="-1" --name=extra_php_version --append - done fi fi fi diff --git a/data/helpers.d/php b/data/helpers.d/php index 0fe118fde..489c448a8 100644 --- a/data/helpers.d/php +++ b/data/helpers.d/php @@ -364,12 +364,6 @@ ynh_install_php () { # Set the default PHP version back as the default version for php-cli. update-alternatives --set php /usr/bin/php$YNH_DEFAULT_PHP_VERSION - # Pin this extra repository after packages are installed to prevent sury of doing shit - for package_to_not_upgrade in "php" "php-fpm" "php-mysql" "php-xml" "php-zip" "php-mbstring" "php-ldap" "php-gd" "php-curl" "php-bz2" "php-json" "php-sqlite3" "php-intl" "openssl" "libssl1.1" "libssl-dev" - do - ynh_pin_repo --package="$package_to_not_upgrade" --pin="origin \"packages.sury.org\"" --priority="-1" --name=extra_php_version --append - done - # Advertise service in admin panel yunohost service add php${phpversion}-fpm --log "/var/log/php${phpversion}-fpm.log" }