diff options
| author | Jos I. Boumans <kane@dwim.org> | 2008-12-15 20:07:04 +0100 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2008-12-16 12:03:27 +0000 |
| commit | cb851209bf3671158183f80a60fff5e1b9a7b95c (patch) | |
| tree | a95a7fd375a01df595e0c5fbb9c26d19d3de5504 | |
| parent | 22c834887a7e9ec7a4463eea76112c68c290b7e6 (diff) | |
| download | perl-cb851209bf3671158183f80a60fff5e1b9a7b95c.tar.gz | |
Re: [PATCH] Update IPC::Cmd to 0.42
From: "Jos I. Boumans" <jos@dwim.org>
Message-Id: <E69CF940-98A5-41C1-B145-32ACED142655@dwim.org>
(Fixes test failures caused by IPC-Cmd upgrade)
p4raw-id: //depot/perl@35119
| -rw-r--r-- | lib/CPANPLUS.pm | 2 | ||||
| -rw-r--r-- | lib/CPANPLUS/t/inc/conf.pl | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/lib/CPANPLUS.pm b/lib/CPANPLUS.pm index 0f106e5767..536c3e31b4 100644 --- a/lib/CPANPLUS.pm +++ b/lib/CPANPLUS.pm @@ -13,7 +13,7 @@ BEGIN { use vars qw( @EXPORT @ISA $VERSION ); @EXPORT = qw( shell fetch get install ); @ISA = qw( Exporter ); - $VERSION = "0.84"; #have to hardcode or cpan.org gets unhappy + $VERSION = "0.84_01"; #have to hardcode or cpan.org gets unhappy } ### purely for backward compatibility, so we can call it from the commandline: diff --git a/lib/CPANPLUS/t/inc/conf.pl b/lib/CPANPLUS/t/inc/conf.pl index ba1b0022ce..61c4b6af4a 100644 --- a/lib/CPANPLUS/t/inc/conf.pl +++ b/lib/CPANPLUS/t/inc/conf.pl @@ -164,13 +164,10 @@ sub gimme_conf { $conf->set_program( pager => '' ); ### dmq tells us that we should run with /nologo - ### if using nmake, as it's very noise otherwise. + ### if using nmake, as it's very noisy otherwise. { my $make = $conf->get_program('make'); - if( $make and basename($make) =~ /^nmake/i and - $make !~ m|/nologo| - ) { - $make .= ' /nologo'; - $conf->set_program( make => $make ); + if( $make and basename($make) =~ /^nmake/i ) { + $conf->set_conf( makeflags => '/nologo' ); } } |