summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2010-11-30 16:58:24 +0000
committerMichael Meeks <michael.meeks@novell.com>2010-11-30 16:59:40 +0000
commit0508338819ce95b1616854c140ac63f80da7c20f (patch)
tree3f0a67b78860d7f940f4ff429fc675c7bd7a5824
parente99c9e0fd792ba8478d3e02eb23d65fc54ff4dcd (diff)
get substitution order right for overlapping variablesLIBREOFFICE_PRE_BOOTSTRAP_BUILD
-rw-r--r--solenv/bin/modules/installer/download.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index b6c3d374d..073516e02 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1708,7 +1708,8 @@ sub replace_variables
{
my ($translationfile, $variableshashref) = @_;
- foreach $key (keys %{$variableshashref})
+ # we want to substitute FOO_BR before FOO to avoid floating _BR suffixes
+ foreach $key (sort { length ($b) <=> length ($a) } keys %{$variableshashref})
{
my $value = $variableshashref->{$key};