From 5da76fa0b1f2a58f67ea1ca3092a4302fdd34fd0 Mon Sep 17 00:00:00 2001 From: Ruediger Oertel Date: Tue, 26 Apr 2011 15:20:11 +0200 Subject: [PATCH] change regexp to not break on mail addresses containing 4 digits --- changelog2spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/changelog2spec b/changelog2spec index 818501c..0128ee7 100755 --- a/changelog2spec +++ b/changelog2spec @@ -68,7 +68,7 @@ sub parse_suse { $_ = $_[0]; my $dline; - die("bad changelog heading\n") unless /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9].*[0-9][0-9][0-9][0-9])(.*\@.*$)/; + die("bad changelog heading\n") unless /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*[0-9][0-9][0-9][0-9])(.*\@.*$)/; my $dt = $1; my $who = $2; $dt = lc($dt); @@ -104,7 +104,7 @@ sub parse_suse { my $change = ''; while(<>) { chomp; - last if /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9].*[0-9][0-9][0-9][0-9])(.*\@.*$)/; + last if /^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*[0-9][0-9][0-9][0-9])(.*\@.*$)/; next if (/^--------------/); next if (/^========================/); s/\s+$//; @@ -163,7 +163,7 @@ while (<>) { next if /^\s*$/; next if (/^--------------/); next if (/^========================/); - if (/^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9].*[0-9][0-9][0-9][0-9])(.*\@.*$)/) { + if (/^(?:\* )?([A-Za-z]+\s+[A-Za-z]+\s+[0-9][^-]*[0-9][0-9][0-9][0-9])(.*\@.*$)/) { $format = 'suse'; } elsif (/^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)((\s+[-+0-9a-z.]+)+)\;.*$/) { -- 2.7.4