Commit to mainline by don@debian.org -- merge changes from don

[Debbugs Maintainers]

------------------------------------------------------------
revno: 861
committer: Debian BTS <[EMAIL PROTECTED]>
branch nick: mainline
timestamp: Sun 2008-08-10 04:46:46 +0000
message:
  merge changes from don
    ------------------------------------------------------------
    revno: 738.1.433
    merged: [EMAIL PROTECTED]
    committer: Don Armstrong <[EMAIL PROTECTED]>
    branch nick: source
    timestamp: Sat 2008-08-09 21:45:02 -0700
    message:
       * fix utter madness in checkmatch

=== modified file 'scripts/service'
--- scripts/service     2008-08-10 04:27:18 +0000
+++ scripts/service     2008-08-10 04:46:37 +0000
@@ -1466,12 +1466,12 @@
 #sub unimplemented {
 #    print {$transcript} "Sorry, command $_[0] not yet implemented.\n\n";
 #}
-
+our %checkmatch_values;
 sub checkmatch {
     my ($string,$mvarname,$svarvalue,@newmergelist) = @_;
     my ($mvarvalue);
     if (@newmergelist) {
-        eval "\$mvarvalue= \$$mvarname";
+       $mvarvalue = $checkmatch_values{$mvarname};
         print {$transcript} "D| checkmatch \`$string' 
/$mvarname/$mvarvalue/$svarvalue/\n"
             if $dl;
         $mismatch .=
@@ -1482,7 +1482,7 @@
     } else {
         print {$transcript} "D| setupmatch \`$string' /$mvarname/$svarvalue/\n"
              if $dl;
-        eval "\$$mvarname= \$svarvalue";
+        $checkmatch_values{$mvarname} = $svarvalue;
     }
 }