|
 |
2e46740 |
--- perl-5.10.1/utils/perlbug.PL.fedora 2009-08-12 20:49:24.000000000 +0200
|
|
|
2e46740 |
+++ perl-5.10.1/utils/perlbug.PL 2009-11-18 15:56:15.000000000 +0100
|
|
 |
5e1703e |
@@ -27,8 +27,6 @@ open OUT, ">$file" or die "Can't create
|
|
|
5e1703e |
open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h")
|
|
|
5e1703e |
or die "Can't open patchlevel.h: $!";
|
|
|
5e1703e |
|
|
|
5e1703e |
-my $patchlevel_date = (stat PATCH_LEVEL)[9];
|
|
|
5e1703e |
-
|
|
|
5e1703e |
while (<PATCH_LEVEL>) {
|
|
|
5e1703e |
last if $_ =~ /^\s*static\s+(?:const\s+)?char.*?local_patches\[\]\s*=\s*{\s*$/;
|
|
|
5e1703e |
}
|
|
|
2e46740 |
@@ -71,9 +69,8 @@ $Config{startperl}
|
|
|
5e1703e |
eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
|
|
|
5e1703e |
if \$running_under_some_shell;
|
|
|
5e1703e |
|
|
|
5e1703e |
-my \$config_tag1 = '$extract_version - $Config{cf_time}';
|
|
|
5e1703e |
+my \$config_tag1 = '$extract_version';
|
|
|
5e1703e |
|
|
|
5e1703e |
-my \$patchlevel_date = $patchlevel_date;
|
|
|
5e1703e |
my \$patch_tags = '$patch_tags';
|
|
|
5e1703e |
my \@patches = (
|
|
|
5e1703e |
$patch_desc
|
|
|
2e46740 |
@@ -333,17 +330,6 @@ sub Init {
|
|
|
2e46740 |
$ok = '';
|
|
|
5e1703e |
if ($::opt_o) {
|
|
|
5e1703e |
if ($::opt_o eq 'k' or $::opt_o eq 'kay') {
|
|
|
5e1703e |
- my $age = time - $patchlevel_date;
|
|
|
5e1703e |
- if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
|
|
|
5e1703e |
- my $date = localtime $patchlevel_date;
|
|
|
5e1703e |
- print <<"EOF";
|
|
|
5e1703e |
-"perlbug -ok" and "perlbug -nok" do not report on Perl versions which
|
|
|
5e1703e |
-are more than 60 days old. This Perl version was constructed on
|
|
|
5e1703e |
-$date. If you really want to report this, use
|
|
|
5e1703e |
-"perlbug -okay" or "perlbug -nokay".
|
|
|
5e1703e |
-EOF
|
|
|
5e1703e |
- exit();
|
|
|
5e1703e |
- }
|
|
|
5e1703e |
# force these options
|
|
|
5e1703e |
unless ($::opt_n) {
|
|
|
5e1703e |
$::opt_S = 1; # don't prompt for send
|
|
|
2e46740 |
@@ -730,8 +716,8 @@ EFF
|
|
|
5e1703e |
print OUT <
|
|
|
5e1703e |
---
|
|
|
5e1703e |
EFF
|
|
|
5e1703e |
- print OUT "This perlbug was built using Perl $config_tag1\n",
|
|
|
5e1703e |
- "It is being executed now by Perl $config_tag2.\n\n"
|
|
|
5e1703e |
+ print OUT "This perlbug was built using Perl $config_tag1 in the Fedora build system.\n",
|
|
|
5e1703e |
+ "It is being executed now by Perl $config_tag2.\n\n"
|
|
|
5e1703e |
if $config_tag2 ne $config_tag1;
|
|
|
5e1703e |
|
|
|
5e1703e |
print OUT <
|