Integrate:

[ 34851]
Integrate:
[ 34824]
Skip #ifdefs and other preprocessor lines when parsing the
local_patches section of patchlevel.h.
p4raw-link: @34851 on //depot/maint-5.10/perl: ce9059978505a6bf593beb13ac348f71222c29c9
p4raw-link: @34824 on //depot/perl: 3bcc0c4bdd9457f6924030e81994a3583d07a8cb

p4raw-id: //depot/maint-5.8/perl@34855
p4raw-integrated: from //depot/maint-5.10/perl@34853 'merge in'
	utils/perlbug.PL (@34532..)

diff --git a/utils/perlbug.PL b/utils/perlbug.PL
index 0d54291..0d382dd 100644 (file)
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -42,6 +42,7 @@ if (! defined($_)) {
 my @patches;
 while (<PATCH_LEVEL>) {
     last if /^\s*}/;
+    next if /^\s*#/;  # preprocessor stuff
     chomp;
     s/^\s+,?\s*"?//;
     s/"\s+STRINGIFY\(PERL_PATCHNUM\)/$patchnum"/;