Change 34635 by [EMAIL PROTECTED] on 2008/10/29 10:22:10
Integrate:
[ 34589]
lib/ExtUtils/t/eu_command.t belongs to ExtUtils-Command, and so does
the about to be committed lib/ExtUtils/t/cp.t
[ 34620]
Subject: installperl patchlet
From: [EMAIL PROTECTED] (Andreas J. Koenig)
Message-ID: <[EMAIL PROTECTED]>
Date: Tue, 28 Oct 2008 05:11:20 +0100
Affected files ...
... //depot/maint-5.10/perl/Porting/Maintainers.pl#15 integrate
... //depot/maint-5.10/perl/installperl#7 integrate
Differences ...
==== //depot/maint-5.10/perl/Porting/Maintainers.pl#15 (text) ====
Index: perl/Porting/Maintainers.pl
--- perl/Porting/Maintainers.pl#14~34557~ 2008-10-22 03:48:20.000000000
-0700
+++ perl/Porting/Maintainers.pl 2008-10-29 03:22:10.000000000 -0700
@@ -317,7 +317,8 @@
'ExtUtils::Command' =>
{
'MAINTAINER' => 'rkobes',
- 'FILES' => q[lib/ExtUtils/Command.pm],
+ 'FILES' => q[lib/ExtUtils/Command.pm
+ lib/ExtUtils/t/{cp,eu_command}.t],
'CPAN' => 1,
},
@@ -344,7 +345,7 @@
'MAINTAINER' => 'mschwern',
'FILES' =>
q[lib/ExtUtils/{Liblist,MakeMaker,Mkbootstrap,Mksymlists,MM*,MY,testlib}.pm
lib/ExtUtils/{Command,Liblist,MakeMaker}
-
lib/ExtUtils/t/{[0-9FLV-Zabd-z]*,IN*,Mkbootstrap,MM_*,PL_FILES,cd,config}.t
+
lib/ExtUtils/t/{[0-9FLV-Zabdf-z]*,IN*,Mkbootstrap,MM_*,PL_FILES,cd,config}.t
t/lib/MakeMaker t/lib/TieIn.pm t/lib/TieOut.pm],
'CPAN' => 1,
},
==== //depot/maint-5.10/perl/installperl#7 (xtext) ====
Index: perl/installperl
--- perl/installperl#6~34276~ 2008-09-05 08:17:22.000000000 -0700
+++ perl/installperl 2008-10-29 03:22:10.000000000 -0700
@@ -601,6 +601,7 @@
next unless m,^/,;
# Use &samepath here because some systems have other dirs linked
# to $mainperldir (like SunOS)
+ next unless -d;
next if samepath($_, $binexp);
next if samepath($_, cwd());
next if ($mainperl_is_instperl && samepath($_, $mainperldir));
End of Patch.
