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 #1110 from YunoHost/dont-mess-sury-pinning

Browse source 
Don't mess with Sury's pinning
This commit is contained in:
Alexandre Aubin 2020-12-31 16:19:06 +01:00 • committed by GitHub
commit 6ea29d8501
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
data/helpers.d/apt
View file

@ -460,7 +460,8 @@ ynh_remove_extra_repo () {
name="${name:-$app}"
ynh_secure_remove "/etc/apt/sources.list.d/$name.list"
ynh_secure_remove "/etc/apt/preferences.d/$name"
# Sury pinning is managed by the regenconf in the core...
[[ "$name" == "extra_php_version" ]] || ynh_secure_remove "/etc/apt/preferences.d/$name"
ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.gpg" > /dev/null
ynh_secure_remove "/etc/apt/trusted.gpg.d/$name.asc" > /dev/null
@ -548,6 +549,9 @@ ynh_pin_repo () {
append="tee"
fi
# Sury pinning is managed by the regenconf in the core...
[[ "$name" != "extra_php_version" ]] || return
mkdir --parents "/etc/apt/preferences.d"
echo "Package: $package
Pin: $pin