In perl.git, the branch blead has been updated
<http://perl5.git.perl.org/perl.git/commitdiff/916240850ea4166b96c94b40be5120efbd47a398?hp=f97d984b6e0fc25b90013bb9c41676c180fd4379>
- Log -----------------------------------------------------------------
commit 916240850ea4166b96c94b40be5120efbd47a398
Author: Chris 'BinGOs' Williams <ch...@bingosnet.co.uk>
Date: Tue Jun 3 22:51:20 2014 +0100
Reduce env var calls to one in ExtUtils::Install
-----------------------------------------------------------------------
Summary of changes:
dist/ExtUtils-Install/lib/ExtUtils/Install.pm | 7 ++++---
dist/ExtUtils-Install/t/Install.t | 9 +++++----
dist/ExtUtils-Install/t/Installapi2.t | 6 ++++--
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
index 83d4dbc..85fe1c9 100644
--- a/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
+++ b/dist/ExtUtils-Install/lib/ExtUtils/Install.pm
@@ -113,6 +113,7 @@ my $Inc_uninstall_warn_handler;
# install relative to here
my $INSTALL_ROOT = $ENV{PERL_INSTALL_ROOT};
+my $INSTALL_QUIET = $ENV{PERL_INSTALL_QUIET};
my $Curdir = File::Spec->curdir;
my $Updir = File::Spec->updir;
@@ -1182,7 +1183,7 @@ sub pm_to_blib {
_mkpath($autodir,0,0755);
while(my($from, $to) = each %$fromto) {
if( -f $to && -s $from == -s $to && -M $to < -M $from ) {
- print "Skip $to (unchanged)\n" unless $ENV{PERL_INSTALL_QUIET};
+ print "Skip $to (unchanged)\n" unless $INSTALL_QUIET;
next;
}
@@ -1195,7 +1196,7 @@ sub pm_to_blib {
$from =~ /\.pm$/;
if (!$need_filtering && 0 == compare($from,$to)) {
- print "Skip $to (unchanged)\n" unless $ENV{PERL_INSTALL_QUIET};
+ print "Skip $to (unchanged)\n" unless $INSTALL_QUIET;
next;
}
if (-f $to){
@@ -1209,7 +1210,7 @@ sub pm_to_blib {
print "$pm_filter <$from >$to\n";
} else {
_copy( $from, $to );
- print "cp $from $to\n" unless $ENV{PERL_INSTALL_QUIET};
+ print "cp $from $to\n" unless $INSTALL_QUIET;
}
my($mode,$atime,$mtime) = (stat $from)[2,8,9];
utime($atime,$mtime+$Is_VMS,$to);
diff --git a/dist/ExtUtils-Install/t/Install.t
b/dist/ExtUtils-Install/t/Install.t
index 1e2f669..440d230 100644
--- a/dist/ExtUtils-Install/t/Install.t
+++ b/dist/ExtUtils-Install/t/Install.t
@@ -16,10 +16,13 @@ use Test::More tests => 60;
use MakeMaker::Test::Setup::BFD;
-BEGIN { use_ok('ExtUtils::Install') }
+BEGIN {
+ local $ENV{PERL_INSTALL_QUIET};
+ use_ok('ExtUtils::Install');
+}
# ensure the env doesn't pollute our tests
local $ENV{EU_INSTALL_ALWAYS_COPY};
-local $ENV{EU_ALWAYS_COPY};
+local $ENV{EU_ALWAYS_COPY};
# Check exports.
foreach my $func (qw(install uninstall pm_to_blib install_default)) {
@@ -37,8 +40,6 @@ END {
chdir 'Big-Dummy';
-local $ENV{PERL_INSTALL_QUIET};
-
my $stdout = tie *STDOUT, 'TieOut';
pm_to_blib( { 'lib/Big/Dummy.pm' => 'blib/lib/Big/Dummy.pm' },
'blib/lib/auto'
diff --git a/dist/ExtUtils-Install/t/Installapi2.t
b/dist/ExtUtils-Install/t/Installapi2.t
index 9719493..4acfdc3 100644
--- a/dist/ExtUtils-Install/t/Installapi2.t
+++ b/dist/ExtUtils-Install/t/Installapi2.t
@@ -16,7 +16,10 @@ use Test::More tests => 70;
use MakeMaker::Test::Setup::BFD;
-BEGIN { use_ok('ExtUtils::Install') }
+BEGIN {
+ local $ENV{PERL_INSTALL_QUIET};
+ use_ok('ExtUtils::Install');
+}
# Check exports.
foreach my $func (qw(install uninstall pm_to_blib install_default)) {
@@ -34,7 +37,6 @@ END {
# ensure the env doesn't pollute our tests
local $ENV{EU_INSTALL_ALWAYS_COPY};
local $ENV{EU_ALWAYS_COPY};
-local $ENV{PERL_INSTALL_QUIET};
chdir 'Big-Dummy';
--
Perl5 Master Repository
