Bugzilla – Attachment 110255 Details for
Bug 26434
Plugin dirs duplicates in @INC with plack
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26434: Fix plugin dirs addition to @INC
Bug-26434-Fix-plugin-dirs-addition-to-INC.patch (text/plain), 2.47 KB, created by
Martin Renvoize (ashimema)
on 2020-09-17 08:32:16 UTC
(
hide
)
Description:
Bug 26434: Fix plugin dirs addition to @INC
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2020-09-17 08:32:16 UTC
Size:
2.47 KB
patch
obsolete
>From 11ede103f26a3f949a5f5882af7de41d323083d5 Mon Sep 17 00:00:00 2001 >From: Fridolin Somers <fridolin.somers@biblibre.com> >Date: Fri, 11 Sep 2020 16:03:28 +0200 >Subject: [PATCH] Bug 26434: Fix plugin dirs addition to @INC > >Plugin dirs defined in koha-conf.xml are added to @INC in order to compile perl code. >Looks like with plack those dirs are added several times. >This may lead to an error "INCLUDE_PATH exceeds 64 directories". > >This bug was identified with Carrousel plugin : https://inlibro.com/instructions-carrousel/ > >Test plan : >1) Enable plack and plugins >2) Look at page about.pl : @INC contains one plugin dir 'var/lib/plugins' >3) Install plugin KitchenSink : https://github.com/bywatersolutions/koha-plugin-kitchen-sink >4) Dont apply patch >5) Use configure on KitchenSink >6) Look at page about.pl : @INC contains server plugin dir 'var/lib/plugins' >7) Apply patch and restart plack >8) Use configure on KitchenSink >9) Look at page about.pl : @INC contains one plugin dir 'var/lib/plugins' > >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com> >--- > Koha/Plugins.pm | 3 ++- > Koha/Plugins/Handler.pm | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > >diff --git a/Koha/Plugins.pm b/Koha/Plugins.pm >index 8d6957a298..092c5e01b7 100644 >--- a/Koha/Plugins.pm >+++ b/Koha/Plugins.pm >@@ -19,6 +19,7 @@ package Koha::Plugins; > > use Modern::Perl; > >+use Array::Utils qw(array_minus); > use Class::Inspector; > use List::MoreUtils qw(any); > use Module::Load::Conditional qw(can_load); >@@ -32,7 +33,7 @@ use Koha::Plugins::Methods; > BEGIN { > my $pluginsdir = C4::Context->config("pluginsdir"); > my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir; >- push( @INC, @pluginsdir ); >+ push @INC, array_minus(@pluginsdir, @INC) ; > pop @INC if $INC[-1] eq '.'; > } > >diff --git a/Koha/Plugins/Handler.pm b/Koha/Plugins/Handler.pm >index aa4970c6fc..6c6ae73023 100644 >--- a/Koha/Plugins/Handler.pm >+++ b/Koha/Plugins/Handler.pm >@@ -19,6 +19,7 @@ package Koha::Plugins::Handler; > > use Modern::Perl; > >+use Array::Utils qw(array_minus); > use File::Path qw(remove_tree); > > use Module::Load qw(load); >@@ -29,7 +30,7 @@ use Koha::Plugins::Methods; > BEGIN { > my $pluginsdir = C4::Context->config("pluginsdir"); > my @pluginsdir = ref($pluginsdir) eq 'ARRAY' ? @$pluginsdir : $pluginsdir; >- push( @INC, @pluginsdir ); >+ push @INC, array_minus(@pluginsdir, @INC) ; > pop @INC if $INC[-1] eq '.' ; > } > >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26434
:
109946
|
110056
| 110255 |
112577