]>
Commit | Line | Data |
---|---|---|
cdd4579c MT |
1 | --- perl-5.10.1/utils/perlbug.PL.fedora 2009-08-12 20:49:24.000000000 +0200 |
2 | +++ perl-5.10.1/utils/perlbug.PL 2009-11-18 15:56:15.000000000 +0100 | |
3 | @@ -27,8 +27,6 @@ open OUT, ">$file" or die "Can't create | |
4 | open PATCH_LEVEL, "<" . catfile(updir, "patchlevel.h") | |
5 | or die "Can't open patchlevel.h: $!"; | |
6 | ||
7 | -my $patchlevel_date = (stat PATCH_LEVEL)[9]; | |
8 | - | |
9 | while (<PATCH_LEVEL>) { | |
10 | last if $_ =~ /^\s*static\s+(?:const\s+)?char.*?local_patches\[\]\s*=\s*{\s*$/; | |
11 | } | |
12 | @@ -71,9 +69,8 @@ $Config{startperl} | |
13 | eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}' | |
14 | if \$running_under_some_shell; | |
15 | ||
16 | -my \$config_tag1 = '$extract_version - $Config{cf_time}'; | |
17 | +my \$config_tag1 = '$extract_version'; | |
18 | ||
19 | -my \$patchlevel_date = $patchlevel_date; | |
20 | my \$patch_tags = '$patch_tags'; | |
21 | my \@patches = ( | |
22 | $patch_desc | |
23 | @@ -333,17 +330,6 @@ sub Init { | |
24 | $ok = ''; | |
25 | if ($::opt_o) { | |
26 | if ($::opt_o eq 'k' or $::opt_o eq 'kay') { | |
27 | - my $age = time - $patchlevel_date; | |
28 | - if ($::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) { | |
29 | - my $date = localtime $patchlevel_date; | |
30 | - print <<"EOF"; | |
31 | -"perlbug -ok" and "perlbug -nok" do not report on Perl versions which | |
32 | -are more than 60 days old. This Perl version was constructed on | |
33 | -$date. If you really want to report this, use | |
34 | -"perlbug -okay" or "perlbug -nokay". | |
35 | -EOF | |
36 | - exit(); | |
37 | - } | |
38 | # force these options | |
39 | unless ($::opt_n) { | |
40 | $::opt_S = 1; # don't prompt for send | |
41 | @@ -730,8 +716,8 @@ EFF | |
42 | print OUT <<EFF; | |
43 | --- | |
44 | EFF | |
45 | - print OUT "This perlbug was built using Perl $config_tag1\n", | |
46 | - "It is being executed now by Perl $config_tag2.\n\n" | |
47 | + print OUT "This perlbug was built using Perl $config_tag1 in the Fedora build system.\n", | |
48 | + "It is being executed now by Perl $config_tag2.\n\n" | |
49 | if $config_tag2 ne $config_tag1; | |
50 | ||
51 | print OUT <<EOF; |