From 064aae37161064abf86430675fe873c58c8ff776 Mon Sep 17 00:00:00 2001 From: "rhelmer%mozilla.com" Date: Fri, 20 Apr 2007 18:55:24 +0000 Subject: [PATCH] suggestions from preed b=371325 comment #20 r=preed git-svn-id: svn://10.0.0.236/trunk@224801 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/tools/release/Bootstrap/Config.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/tools/release/Bootstrap/Config.pm b/mozilla/tools/release/Bootstrap/Config.pm index 33354488576..310c4a65dcc 100644 --- a/mozilla/tools/release/Bootstrap/Config.pm +++ b/mozilla/tools/release/Bootstrap/Config.pm @@ -205,16 +205,16 @@ sub Bump { $skipNextLine = 1; my $interpLine = $line; $interpLine =~ s/^#\s+CONFIG:\s+//; - foreach my $variable (grep(/%\w+\-*%/, split(/\s+/, $line))) { + foreach my $variable (grep(/%[\w\-]+%/, split(/\s+/, $line))) { my $key = $variable; - if (! ($key =~ s/.*%(\w+\-*)%.*/$1/g)) { + if (! ($key =~ s/.*%([\w\-]+)%.*/$1/)) { die("ASSERT: could not parse $variable"); } - if (! $config->Exists(var => $key)) { + if (! $config->Exists(sysvar => $key)) { die("ASSERT: no replacement found for $key"); } - my $value = $config->Get(var => $key); + my $value = $config->Get(sysvar => $key); $interpLine =~ s/\%$key\%/$value/g; } print OUTFILE $interpLine;