[Libreoffice-commits] core.git: 2 commits - solenv/bin

[Michael Meeks]

 solenv/bin/modules/installer/control.pm |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 9490a5575320d06079f55869631f90ce80ecc6d3
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Thu May 23 11:32:33 2013 +0100

    further cleanup to tolerate DOS line endings.
    
    Change-Id: I60345ed3eed84ef197bf145f2b26dfa8afdc51b1

diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm
index 67dd193..a45ffcd 100644
--- a/solenv/bin/modules/installer/control.pm
+++ b/solenv/bin/modules/installer/control.pm
@@ -431,8 +431,10 @@ sub read_lcidlist
     for ( my $i = 0; $i <= $#{$lcidlist}; $i++ )
     {
         my $line = ${$lcidlist}[$i];
-
-        $line =~ s/\#.*$//; # removing comments after "#"
+        # de-mangle various potential DOS line-ending problems
+        $line =~ s/\r//g;
+        $line =~ s/\n//g;
+        $line =~ s/\s*\#.*$//; # removing comments after "#"
         if ( $line =~ /^\s*$/ ) { next; }  # this is an empty line
 
         if ( $line =~ /^\s*([\w-]+)\s+(\d+)\s+(\d+)\s*$/ )
commit 197529947593132daf7a6e9dffa7c34e4203a393
Author: Michael Meeks <michael.meeks at 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;