* 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 97ccd3c125fc8e32c7b488ce8898137c9e5dc2c1..d71bb138c40491dc8f4690fa1bcf5d1938c1614e 100755 (executable)
--- 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;