From 81db1598d5005e018c585d8b761feecea8fa35c6 Mon Sep 17 00:00:00 2001 From: "ljf (zamentur)" Date: Wed, 17 Apr 2019 15:02:59 +0200 Subject: [PATCH 1/2] [fix] ynh_psql_remove_db fail --- data/helpers.d/psql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/helpers.d/psql b/data/helpers.d/psql index 2212d692a..c5e065f07 100644 --- a/data/helpers.d/psql +++ b/data/helpers.d/psql @@ -174,7 +174,7 @@ ynh_psql_database_exists() { # Manage arguments with getopts ynh_handle_getopts_args "$@" - if ! sudo --login --user=postgres PGUSER="postgres" PGPASSWORD="$(sudo cat $PSQL_ROOT_PWD_FILE)" psql -tAc "SELECT datname FROM pg_database WHERE datname='$database';" | grep --quiet "$user"; then + if ! sudo --login --user=postgres PGUSER="postgres" PGPASSWORD="$(sudo cat $PSQL_ROOT_PWD_FILE)" psql -tAc "SELECT datname FROM pg_database WHERE datname='$database';" | grep --quiet "$database"; then return 1 else return 0 From c58acfc61eb30d134ad59c28a39f580d10689e65 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Thu, 18 Apr 2019 17:32:48 +0200 Subject: [PATCH 2/2] Update changelog for 3.5.2.2 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index a63461ed9..a22959899 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +yunohost (3.5.2.2) stable; urgency=low + + - Hotfix for ynh_psql_remove_db (from ljf) + + -- Alexandre Aubin Thu, 18 Apr 2019 17:32:00 +0000 + yunohost (3.5.2.1) stable; urgency=low - [fix] Fresh install was broken because of yunohost_admin.conf initialization