diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-01-17 12:49:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-17 12:49:38 +0100 |
| commit | 2635cb9c2a8b1cd0a548185e3c7a07ee64f842b1 (patch) | |
| tree | 12dabc069a010f98c2af8b3814297ce6018fa0fe /config-model | |
| parent | 81dd40e6b039a7e15acbd11b8ee2f5d89eaf2db2 (diff) | |
| parent | b3e72623dce8af9a609fc34786732ba3dfaafcbf (diff) | |
Merge pull request #11834 from vespa-engine/toregge/enable-vespa-site-perl-in-perl-bootstrap-section
Enable vespa site perl in bootstrap section of perl scripts.
Diffstat (limited to 'config-model')
| -rwxr-xr-x | config-model/src/main/perl/vespa-deploy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/perl/vespa-deploy b/config-model/src/main/perl/vespa-deploy index 3519d5ace58..c4da8cccd7c 100755 --- a/config-model/src/main/perl/vespa-deploy +++ b/config-model/src/main/perl/vespa-deploy @@ -41,7 +41,7 @@ sub findhome { } # Try the ROOT env variable - $ROOT = $ENV{'ROOT'}; + my $ROOT = $ENV{'ROOT'}; return $ROOT if is_vespa_home($ROOT); # Try the script location or current dir @@ -77,10 +77,10 @@ BEGIN { } my $VESPA_HOME = $ENV{'VESPA_HOME'}; +use lib $VESPA_HOME . "/lib/perl5/site_perl"; + # END perl environment bootstrap section -use lib $ENV{'VESPA_HOME'} . '/lib/perl5/site_perl'; -use lib $ENV{'VESPA_HOME'} . '/lib64/perl5/site_perl'; use Yahoo::Vespa::Defaults; readConfFile(); |