The branch master has been updated
via 1cc98f75bfaf16a3a1038cf36cb053f330e4ac30 (commit)
from 52739e40ccc1b16cd966ea204bcfea3cc874fec8 (commit)
- Log -----------------------------------------------------------------
commit 1cc98f75bfaf16a3a1038cf36cb053f330e4ac30
Author: Richard Levitte <[email protected]>
Date: Thu Feb 4 19:41:56 2016 +0100
Change the transfer perl module so the real module gets properly registered
This is an important move if scripts want to refer to the loaded
module without having perl think it needs to be loaded (again).
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
external/perl/transfer/Text/Template.pm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/external/perl/transfer/Text/Template.pm
b/external/perl/transfer/Text/Template.pm
index 13ed1eb..3779df9 100644
--- a/external/perl/transfer/Text/Template.pm
+++ b/external/perl/transfer/Text/Template.pm
@@ -5,8 +5,9 @@
BEGIN {
use File::Spec::Functions;
use File::Basename;
- use lib catdir(dirname(__FILE__), "..", "..");
- my $texttemplate = catfile("Text-Template-1.46", "lib", "Text",
"Template.pm");
- require $texttemplate;
+ use lib catdir(dirname(__FILE__), "..", "..",
+ "Text-Template-1.46", "lib");
+ use Text::Template;
+ shift @INC; # Takes away the effect of use lib
}
1;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
