Skip to content

Commit 31a496f

Browse files
authored
Merge pull request bitcoin#1299 from ajtowns/202204-longtitle
bip-326: avoid errors from scripts/buildtable.pl
2 parents 3d70faf + 234bb91 commit 31a496f

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

bip-0326.mediawiki

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
Author: Chris Belcher <belcher at riseup dot net>
66
Status: Draft
77
Type: Informational
8+
Comments-Summary: No comments yet.
9+
Comments-URI: https://github.com/bitcoin/bips/wiki/Comments:BIP-0326
810
Created: 2021-06-10
9-
License: CC-0
11+
License: CC0-1.0
1012
Post-History: 2021-6-10: https://lists.linuxfoundation.org/pipermail/bitcoin-dev/2021-June/019048.html
1113
</pre>
1214

scripts/buildtable.pl

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
);
9090
my %GrandfatheredPD = map { $_ => undef } qw(9 36 37 38 42 49 50 60 65 67 69 74 80 81 83 90 99 105 107 109 111 112 113 114 122 124 125 126 130 131 132 133 140 141 142 143 144 146 147 150 151 152);
9191
my %TolerateMissingLicense = map { $_ => undef } qw(1 10 11 12 13 14 15 16 21 31 33 34 35 39 43 44 45 47 61 64 68 70 71 72 73 101 102 106 120 121);
92-
my %TolerateTitleTooLong = map { $_ => undef } qw(39 44 45 47 49 60 67 68 69 73 74 75 80 81 99 105 106 109 113 122 126 131 143 145 147 173);
92+
my %TolerateTitleTooLong = map { $_ => undef } qw(39 44 45 47 49 60 67 68 69 73 74 75 80 81 99 105 106 109 113 122 126 131 143 145 147 173 326);
9393

9494
my %emails;
9595

@@ -127,7 +127,10 @@
127127
my $title_len = length($title);
128128
die "$fn has too-long TItle ($title_len > 44 char max)" if $title_len > 44 and not exists $TolerateTitleTooLong{$bipnum};
129129
} elsif ($field eq 'Author') {
130-
$val =~ m/^(\S[^<@>]*\S) \<([^@>]*\@[\w.]+\.\w+)\>$/ or die "Malformed Author line in $fn";
130+
my $deantispam = $val;
131+
$deantispam =~ s/ at /@/;
132+
$deantispam =~ s/ dot /./g;
133+
$deantispam =~ m/^(\S[^<@>]*\S) \<([^@>]*\@[\w.]+\.\w+)\>$/ or die "Malformed Author line in $fn";
131134
my ($authorname, $authoremail) = ($1, $2);
132135
$authoremail =~ s/(?<=\D)$bipnum(?=\D)/<BIPNUM>/g;
133136
$emails{$authorname}->{$authoremail} = undef;

0 commit comments

Comments
 (0)