From: Jos I. Boumans <kane@dwim.org>
Date: Mon, 15 Dec 2008 19:07:04 +0000 (+0100)
Subject: Re: [PATCH] Update IPC::Cmd to 0.42
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=74ae847926f0d2fb3e4611242365c461066cf4df;p=p5sagit%2Fp5-mst-13.2.git

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
---

diff --git a/lib/CPANPLUS.pm b/lib/CPANPLUS.pm
index 0f106e5..536c3e3 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 ba1b002..61c4b6a 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' );
         }
     }