Attachment 134354 Details for Bug 10517 – Bug 10517: (QA follow-up) No need to remove second true

[patch] Bug 10517: (QA follow-up) No need to remove second true

Bug-10517-QA-follow-up-No-need-to-remove-second-tr.patch (text/plain), 1.18 KB, created by Marcel de Rooy on 2022-04-29 09:20:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2022-04-29 09:20:58 UTC

Size: 1.18 KB

patch

obsolete

>From 2bd9a676eaa4b40e61585fa9e4d606cb3912ebaf Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 29 Apr 2022 09:18:24 +0000
>Subject: [PATCH] Bug 10517: (QA follow-up) No need to remove second true
>Content-Type: text/plain; charset=utf-8
>
>This is just theoretical, but by removing the second true you
>could end the script on another error.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> debian/scripts/koha-restore | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/debian/scripts/koha-restore b/debian/scripts/koha-restore
>index 7c68d65c29..ede23ad18d 100755
>--- a/debian/scripts/koha-restore
>+++ b/debian/scripts/koha-restore
>@@ -72,7 +72,7 @@ mysqldb="koha_$name"
> mysqluser="koha_$name"
> mysqlpwd="$( xmlstarlet sel -t -v 'yazgfs/config/pass' /etc/koha/sites/$name/koha-conf.xml )"
> zcat "$sqldump" | mysql --defaults-extra-file=/etc/mysql/koha-common.cnf
>-mysql --defaults-extra-file=/etc/mysql/koha-common.cnf <<eof
>+mysql --defaults-extra-file=/etc/mysql/koha-common.cnf << eof || true
> DROP USER IF EXISTS '$mysqluser';
> CREATE USER '$mysqluser' IDENTIFIED BY '$mysqlpwd';
> GRANT ALL PRIVILEGES ON $mysqldb.* TO '$mysqluser';
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 10517: 19284 | 89529 | 96975 | 127865 | 133758 | 134353 | 134354