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
commit01b2b72fe4905fb4c3aa1bf3c2c63bd37d51cf52 (patch)
treed1d9f5199bafd8e64413d8e68dd555679a17535a
parent6aec2351408cc928ff5cc8167465a7b6d6f77597 (diff)
get substitution order right for overlapping variables
Notes
split repo tag: bootstrap_LIBREOFFICE_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 ceb237ecbc8e..01fe0e4691e6 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};