From c6e762094f52f77d9d9b27ceb8b5cf7296b4a88d Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Sat, 9 Aug 2008 21:45:02 -0700 Subject: [PATCH] * fix utter madness in checkmatch --- scripts/service | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/service b/scripts/service index 52540ef..39af608 100755 --- a/scripts/service +++ b/scripts/service @@ -1466,12 +1466,12 @@ sub sendhelp { #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 @@ sub checkmatch { } else { print {$transcript} "D| setupmatch \`$string' /$mvarname/$svarvalue/\n" if $dl; - eval "\$$mvarname= \$svarvalue"; + $checkmatch_values{$mvarname} = $svarvalue; } } -- 2.39.2