gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 40901: (QA follow-up) Fix stale /etc/default/koha-common reference in koha-generate-env 

koha-generate-env sourced /etc/default/koha-common to read
INDEXER_TIMEOUT, but the defaults file was renamed to
/etc/default/koha-core in this patchset.  On fresh installations no
/etc/default/koha-common exists, so INDEXER_TIMEOUT was always silently
fixed at the built-in default of 5, ignoring any admin customisation.

Read /etc/default/koha-core first; fall back to /etc/default/koha-common
so that systems upgrading from the pre-split packaging still pick up
their existing settings.

Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Pedro Amorim <pedro.amorim@openfifth.co.uk>
This commit is contained in:
Martin Renvoize 2026-05-21 17:44:18 +01:00 committed by Pedro Amorim
parent b5000b8869
commit 3644a8407f
No known key found for this signature in database
GPG Key ID: 06B75BA7F3894D55
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/scripts/koha-generate-env vendored
View File

@ -75,9 +75,13 @@ EOF
;; ;;
indexer) indexer)
# Read from /etc/default/koha-common if available # Read from /etc/default/koha-core (fall back to the legacy
# /etc/default/koha-common name on systems upgrading from the
# pre-split packaging).
INDEXER_TIMEOUT=5 INDEXER_TIMEOUT=5
if [ -f /etc/default/koha-common ]; then if [ -f /etc/default/koha-core ]; then
. /etc/default/koha-core
elif [ -f /etc/default/koha-common ]; then
. /etc/default/koha-common . /etc/default/koha-common
fi fi