Change 33169 by [EMAIL PROTECTED] on 2008/02/01 16:15:41
Integrate:
[ 33158]
Integrate:
[ 33031]
Subject: [PATCH] Ignore build dir when installing perl
From: "Jerry D. Hedden" <[EMAIL PROTECTED]>
Date: Sat, 19 Jan 2008 12:19:41 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 33160]
Integrate:
[ 32986]
Subject: [PATCH utils/perlbug.PL] Don't ask about a module when using
-ok
From: Abigail <[EMAIL PROTECTED]>
Message-ID: <[EMAIL PROTECTED]>
Date: Wed, 16 Jan 2008 18:46:17 +0100
Affected files ...
... //depot/maint-5.8/perl/installperl#38 integrate
... //depot/maint-5.8/perl/utils/perlbug.PL#6 integrate
Differences ...
==== //depot/maint-5.8/perl/installperl#38 (xtext) ====
Index: perl/installperl
--- perl/installperl#37~32380~ 2007-11-17 12:47:39.000000000 -0800
+++ perl/installperl 2008-02-01 08:15:41.000000000 -0800
@@ -54,6 +54,7 @@
use File::Copy ();
use File::Path ();
use ExtUtils::Packlist;
+use Cwd;
use Config;
use subs qw(unlink link chmod);
@@ -631,6 +632,7 @@
# Use &samepath here because some systems have other dirs linked
# to $mainperldir (like SunOS)
next if samepath($_, $binexp);
+ next if samepath($_, cwd());
next if ($mainperl_is_instperl && samepath($_, $mainperldir));
my $otherperl = "$_/$perl$exe_ext";
next if $otherperls{$otherperl}++;
==== //depot/maint-5.8/perl/utils/perlbug.PL#6 (text) ====
Index: perl/utils/perlbug.PL
--- perl/utils/perlbug.PL#5~32311~ 2007-11-14 09:23:02.000000000 -0800
+++ perl/utils/perlbug.PL 2008-02-01 08:15:41.000000000 -0800
@@ -509,7 +509,7 @@
}
}
my $report_about_module = '';
- if ($::HaveCoreList) {
+ if ($::HaveCoreList && !$ok) {
paraprint <<EOF;
Is your report about a Perl module? If yes, enter its name. If not, skip.
EOF
End of Patch.
