diff options
author | dave%intrec.com <> | 2001-03-09 02:29:09 +0100 |
---|---|---|
committer | dave%intrec.com <> | 2001-03-09 02:29:09 +0100 |
commit | e98760989ab69ac008f20d9cbaa26988bd17f2d9 (patch) | |
tree | b88d1c83cc674f84f64ff07606795a2b8f7a7038 /checksetup.pl | |
parent | 597421027b8ef62728dba92e610cfa95fc1f6278 (diff) | |
download | bugzilla-e98760989ab69ac008f20d9cbaa26988bd17f2d9.tar.gz bugzilla-e98760989ab69ac008f20d9cbaa26988bd17f2d9.tar.xz |
Refix for bug 25693: more accurate regexp to find duplicates when generating initial duplicates table.
Diffstat (limited to 'checksetup.pl')
-rwxr-xr-x | checksetup.pl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/checksetup.pl b/checksetup.pl index abc3fea44..8a141a067 100755 --- a/checksetup.pl +++ b/checksetup.pl @@ -2029,7 +2029,7 @@ if (!($sth->fetchrow_arrayref()->[0])) { print("Populating duplicates table...\n"); $sth = $dbh->prepare("SELECT longdescs.bug_id, thetext FROM longdescs left JOIN bugs using(bug_id) WHERE (thetext " . - "regexp 'This bug has been marked as a duplicate of') AND (resolution = 'DUPLICATE') ORDER" . + "regexp '[.*.]{3,3} This bug has been marked as a duplicate of [[:digit:]]{1,5} [.*.]{3,3}') AND (resolution = 'DUPLICATE') ORDER" . " BY longdescs.bug_when"); $sth->execute(); @@ -2044,9 +2044,9 @@ if (!($sth->fetchrow_arrayref()->[0])) { foreach $key (keys(%dupes)) { - $dupes{$key} =~ s/.*This bug has been marked as a duplicate of (\d{1,5}).*/$1/sm; + $dupes{$key} =~ s/.*\*\*\* This bug has been marked as a duplicate of (\d{1,5}) \*\*\*.*?/$1/sm; $dbh->do("INSERT INTO duplicates VALUES('$dupes{$key}', '$key')"); - # BugItsADupeOf Dupe + # BugItsADupeOf Dupe } $::regenerateshadow = 1; |