solenv/bin/modules/installer/control.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 95d6675fd89f44bf499ec4fc5ed48f547cba80fa Author: Andras Timar <ati...@suse.com> Date: Thu Jul 19 08:03:08 2012 +0200 skip empty lines in msi-encodinglist.txt Change-Id: I1dbcf68c9581e5b66df0f4485d73ca19c5168dd9 diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 43694b7..efc6331 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -417,6 +417,8 @@ sub read_encodinglist 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*$/ ) @@ -430,7 +432,7 @@ sub read_encodinglist } else { - installer::exiter::exit_program("ERROR: Wrong syntax in Windows encoding list $installer::globals::encodinglistname : en-US 1252 1033 !", "read_encodinglist"); + installer::exiter::exit_program("ERROR: Wrong syntax in Windows encoding list $installer::globals::encodinglistname in line $i.", "read_encodinglist"); } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits