[prev in list] [next in list] [prev in thread] [next in thread] 

List:       perl5-changes
Subject:    Change 35119: Re: [PATCH] Update IPC::Cmd to 0.42
From:       Steve Hay <SteveHay () planit ! com>
Date:       2008-12-16 12:15:03
Message-ID: 20081216121503.CD0FD1402F () mx ! activestate ! com
[Download RAW message or body]

Change 35119 by steveh@maldoror on 2008/12/16 12:03:27

	Subject: Re: [PATCH] Update IPC::Cmd to 0.42
	From: "Jos I. Boumans" <jos@dwim.org>
	Date: Mon, 15 Dec 2008 19:07:04 +0100
	Message-Id: <E69CF940-98A5-41C1-B145-32ACED142655@dwim.org>
	
	(Fixes test failures caused by IPC-Cmd upgrade)

Affected files ...

... //depot/perl/lib/CPANPLUS.pm#13 edit
... //depot/perl/lib/CPANPLUS/t/inc/conf.pl#13 edit

Differences ...

==== //depot/perl/lib/CPANPLUS.pm#13 (text) ====
Index: perl/lib/CPANPLUS.pm
--- perl/lib/CPANPLUS.pm#12~32619~	2007-12-16 06:58:20.000000000 -0800
+++ perl/lib/CPANPLUS.pm	2008-12-16 04:03:27.000000000 -0800
@@ -13,7 +13,7 @@
     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:

==== //depot/perl/lib/CPANPLUS/t/inc/conf.pl#13 (text) ====
Index: perl/lib/CPANPLUS/t/inc/conf.pl
--- perl/lib/CPANPLUS/t/inc/conf.pl#12~32284~	2007-11-12 06:38:17.000000000 -0800
+++ perl/lib/CPANPLUS/t/inc/conf.pl	2008-12-16 04:03:27.000000000 -0800
@@ -164,13 +164,10 @@
     $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' );
         }
     }
     
End of Patch.
[prev in list] [next in list] [prev in thread] [next in thread]