solenv/bin/modules/installer/control.pm | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 818958a5da333d6bd36cba0f3d952b595f002130
Author: Michael Meeks <michael.me...@suse.com>
Date: Thu May 23 10:09:35 2013 +0100
attempted blind fix of msi encoding parsing issue.
Change-Id: Iae582b8733254233517dbbf20a9293041b2f9b6d
diff --git a/solenv/bin/modules/installer/control.pm
b/solenv/bin/modules/installer/control.pm
index 7600754..67dd193 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -432,10 +432,10 @@ sub read_lcidlist
{
my $line = ${$lcidlist}[$i];
- if ( $line =~ /^\s*\#/ ) { next; } # this is a comment line
- if ( $line =~ /^$/ ) { next; } # this is an empty line
- if ( $line =~ /^(.*?)(\#.*)$/ ) { $line = $1; } # removing comments
after "#"
- if ( $line =~ /^\s*([\w-]+)\s*(\d+)\s*(\d+)\s*$/ )
+ $line =~ s/\#.*$//; # removing comments after "#"
+ if ( $line =~ /^\s*$/ ) { next; } # this is an empty line
+
+ if ( $line =~ /^\s*([\w-]+)\s+(\d+)\s+(\d+)\s*$/ )
{
my $onelanguage = $1;
my $windowslanguage = $3;
@@ -443,7 +443,7 @@ sub read_lcidlist
}
else
{
- installer::exiter::exit_program("ERROR: Wrong syntax in Windows
LCID list $installer::globals::lcidlistname in line $i.", "read_lcidlist");
+ installer::exiter::exit_program("ERROR: Wrong syntax in Windows
LCID list $installer::globals::lcidlistname in line $i: '$line'",
"read_lcidlist");
}
}
$installer::globals::msilanguage = \%msilanguage;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
