mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip empty lines in msi-encodinglist.txt

Browse Source 
Change-Id: I1dbcf68c9581e5b66df0f4485d73ca19c5168dd9
This commit is contained in:
Andras Timar
2012-07-19 08:03:08 +02:00
parent f674de15e1
commit 95d6675fd8
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
solenv/bin/modules/installer/control.pm
View File

@@ -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");
}
}