Bugzilla – Attachment 60064 Details for
Bug 16749
Additional fixes for debian scripts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17049: Improve PERL5LIB handling for packaged dev install
Bug-17049-Improve-PERL5LIB-handling-for-packaged-d.patch (text/plain), 1.88 KB, created by
Marcel de Rooy
on 2017-02-09 12:05:14 UTC
(
hide
)
Description:
Bug 17049: Improve PERL5LIB handling for packaged dev install
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2017-02-09 12:05:14 UTC
Size:
1.88 KB
patch
obsolete
>From 52ed8d81edca67696e90e0da4a1598ce1c960626 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Tue, 9 Aug 2016 15:52:34 +0200 >Subject: [PATCH] Bug 17049: Improve PERL5LIB handling for packaged dev install >Content-Type: text/plain; charset=utf-8 > >This is a small follow-up for report 16733. >If you would have multiple paths in PERL5LIB from /etc/defaults, >adjust_paths_dev_install would agressively replace them for dev >installs. >This patch makes it remove usr/share/koha/lib only and add the >new dev install path. > >Test plan: >[1] Apply the patches for 16733 and 17049. >[2] Add a <dev_install>/just/a/path</dev_install> to koha-conf.xml. >[3] Source the adjusted koha-functions.sh within your master clone: > . debian/scripts/koha-functions.sh >[4] Enter unset PERL5LIB; adjust_paths_dev_install [your-clone] >[5] Check the result with echo $PERL5LIB. Should be /just/a/path. >[6] Try PERL5LIB=/usr/share/koha/lib > Run adjust_paths_dev_install [your-clone] > Check the result with echo $PERL5LIB. Should be /just/a/path. >[7] Similarly, try /a:/usr/share/koha/lib > Expect: /just/a/path:/a > And /a:/usr/share/koha/lib:/b. Expect: /just/a/path:/a:/b >--- > debian/scripts/koha-functions.sh | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > >diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh >index 167998e..5e9fcde 100755 >--- a/debian/scripts/koha-functions.sh >+++ b/debian/scripts/koha-functions.sh >@@ -231,7 +231,10 @@ adjust_paths_dev_install() > if [ "$dev_install" != "" ]; then > DEV_INSTALL=1 > KOHA_HOME=$dev_install >- PERL5LIB=$dev_install >+ # Remove usr/share/koha/lib, add dev_install and cleanup >+ PERL5LIB=$(echo $PERL5LIB|sed -e 's/\/usr\/share\/koha\/lib\(:\|$\)/\1/') >+ PERL5LIB=$dev_install:$PERL5LIB >+ PERL5LIB=$(echo $PERL5LIB|sed -e 's/::/:/' -e 's/:$//') > fi > } > >-- >2.1.4
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 16749
:
52561
|
55490
|
60064
|
60103
|
60106
|
60109
|
60110
|
60111
|
60112
|
60113
|
60114
|
60125
|
60126
|
60129
|
60130
|
60131
|
60132
|
60139
|
60140
|
60193
|
60194
|
60195
|
60196
|
60197
|
60335
|
60340
|
60343
|
60344
|
60345
|
60346
|
60347
|
60348
|
60349
|
60350