[Secure-testing-commits] r591 - sarge-checks

[Joey Hess]

Author: joeyh
Date: 2005-03-21 11:24:02 +0100 (Mon, 21 Mar 2005)
New Revision: 591

Modified:
   sarge-checks/updatelist
Log:
really support XXX-ish placeholders in the list
incidentially, fix syntax error introduced earlier


Modified: sarge-checks/updatelist
===================================================================
--- sarge-checks/updatelist	2005-03-21 09:01:59 UTC (rev 590)
+++ sarge-checks/updatelist	2005-03-21 10:24:02 UTC (rev 591)
@@ -31,7 +31,7 @@
 open (FULL_CAN, "<$full_can_html") || die "$full_can_html: $!\n";
 my $can;
 while (<FULL_CAN>) {
-	if (m!<b>(CAN-(?:\d+|[A-Z]+)-(?:\d+|[A-Z]+)</b>!) {
+	if (m!<b>(CAN-\d+-\d+)</b>!) {
 		$can=$1;
 		$cans{$can}{can}=$can;
 		$listedcans{$can}=1;
@@ -89,7 +89,7 @@
 my $can;
 while (<IN>) {
 	chomp;
-	if (/^((?:CAN|CVE)-[-0-9]*)\s*(.*)/) {
+	if (/^((?:CAN|CVE)-(?:[0-9]+|[A-Z]+)-(?:[0-9]+|[A-Z]+))\s*(.*)/) {
 		my $desc=$2;
 		docan($can) if $can;
 		$can=$1;