From 1ee321e1a0741c4f764d019b782cb8018050d71f Mon Sep 17 00:00:00 2001 From: David Cook Date: Mon, 18 May 2020 07:08:18 +0000 Subject: [PATCH] Bug 25524: Remove --line-regexp option in log4perl_component() The current grep expression uses -x|--line-regexp, but that causes the regexp to fail to match since we're not specifying a regexp that can match a whole line. We can either provide a better regexp, or remove that --line-regexp option. This patch removes the --line-regexp (ie -x) option from the grep in log4perl_component, so that it detects logger components correctly. To Test: 0) Apply patch 1) Build Koha package 2) Look at /etc/koha/sites/kohadev/log4perl.conf in an existing Koha instance (e.g. on koha-testing-docker), and note it has components for z3950, api, and sip 3) Install package 4) Note that /etc/koha/sites/kohadev/log4perl.conf is the same as before 5) Remove the "log4perl.logger.sip and log4perl.appender.SIP lines from /etc/koha/sites/kohadev/log4perl.conf 6) Reinstall package 7) Note that the missing lines have been appended to the file at /etc/koha/sites/kohadev/log4perl.conf Signed-off-by: Chris Cormack --- debian/koha-common.postinst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/koha-common.postinst b/debian/koha-common.postinst index b645b470ce1..af595fa4ce5 100644 --- a/debian/koha-common.postinst +++ b/debian/koha-common.postinst @@ -136,7 +136,7 @@ log4perl_component() local config=$1 local component=$2 - if grep -q -x "log4perl.logger.$component" $config; then + if grep -q "log4perl.logger.$component" $config; then return 0 else return 1 -- 2.11.0