diff options
| author | Andras Timar <atimar@suse.com> | 2012-07-19 08:03:08 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-07-19 08:03:08 +0200 |
| commit | 95d6675fd89f44bf499ec4fc5ed48f547cba80fa (patch) | |
| tree | 725403e5f2c2f6a7a0bea86168c0df414d100502 /solenv | |
| parent | f674de15e17e9608003d7b0af2abe3c11d1b1856 (diff) | |
skip empty lines in msi-encodinglist.txt
Change-Id: I1dbcf68c9581e5b66df0f4485d73ca19c5168dd9
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 43694b733e41..efc633135b71 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"); } } |