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 branch 'stretch-testing' into stretch-unstable

Browse source
This commit is contained in:
Alexandre Aubin 2019-10-29 15:50:51 +01:00
commit a2563db0e6
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/helpers.d/apt
View file

@ -227,7 +227,7 @@ ynh_install_app_dependencies () {
if echo $dependencies | grep -q 'php'; if echo $dependencies | grep -q 'php';
then then
# And we have packages from sury installed (7.0.33-10+weirdshiftafter instead of 7.0.33-0 on debian) # And we have packages from sury installed (7.0.33-10+weirdshiftafter instead of 7.0.33-0 on debian)
if dpkg --list | grep "php7.0" | grep -q -v "7.0.33-0+deb9u5" if dpkg --list | grep "php7.0" | grep -q -v "7.0.33-0+deb9"
then then
# And sury ain't already installed # And sury ain't already installed
if ! grep -nrq "sury" /etc/apt/sources.list* if ! grep -nrq "sury" /etc/apt/sources.list*

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
yunohost (3.6.5.3) stable; urgency=low
- [fix] More general grep for the php/sury dependency nightmare fix (followup of #809)
-- Alexandre Aubin <alex.aubin@mailoo.org> Tue, 29 Oct 2019 03:48:00 +0000
yunohost (3.6.5.2) stable; urgency=low yunohost (3.6.5.2) stable; urgency=low
- [fix] Alex was drunk and released an epic stupid bug in stable (2623d385) - [fix] Alex was drunk and released an epic stupid bug in stable (2623d385)