From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 3 Jul 2007 09:03:01 +0000 (-0700)
Subject:  * Bring the notfound regex into line with the found regex
X-Git-Tag: release/2.6.0~528^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3c4504cce7015024dbe09382f1e43a407be9a26e;p=debbugs.git

 * Bring the notfound regex into line with the found regex
 * Indicate when found reopens a bug
 * Capture the package name in the found regex as well
---

diff --git a/scripts/service.in b/scripts/service.in
index 97ccd3c1..d71bb138 100755
--- a/scripts/service.in
+++ b/scripts/service.in
@@ -534,8 +534,8 @@ END
             }
         }
     } elsif (m{^found\s+\#?(-?\d+)
-	       (?:\s+(?:$config{package_name_re}\/)?
-		    ($config{package_version_re}))?$}ix) {
+	       (?:\s+((?:$config{package_name_re}\/)?
+		    $config{package_version_re}))?$}ix) {
         $ok++;
         $ref= $1;
         $version= $2;
@@ -565,6 +565,7 @@ END
 			     map {s{.+/}{}; $_;} @{$data->{fixed_versions}};
 			if (not @fixed_order or (Debbugs::Versions::Dpkg::vercmp($version_only,$fixed_order[-1]) >= 0)) {
 			     $data->{done} = '';
+			     $action = "$gBug marked as found in version $version and reopened.";
 			}
                     } else {
                         # Versionless found; assume old-style "not fixed at
@@ -575,7 +576,9 @@ END
                 } while (&getnextbug);
             }
         }
-    } elsif (m/^notfound\s+\#?(-?\d+)\s+(\d.*)$/i) {
+    } elsif (m[^notfound\s+\#?(-?\d+)
+	       (?:\s+(?:$config{package_name_re}\/)?
+		    ($config{package_version_re}))$]ix) {
         $ok++;
         $ref= $1;
         $version= $2;