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

[Michael Stahl]

 solenv/bin/modules/installer/filelists.pm |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

New commits:
commit b051510796dcf289edcd03737087176e53bbe4b8
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Oct 29 12:12:40 2015 +0100

    solenv: hack to maybe fix WNT instset creation
    
    Apparently that regex doesn't work on WNT for non-obvious reasons;
    clearly this should be fixed properly by somebody with actual Perl
    knowledge.
    
    (regression from 644fe0abd5dd9fb468c913337ae616fe26f9e3ad)
    
    Change-Id: Ifed4ff3305e4961709a45f6a0ce40dc0683ccf28

diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm
index c723166..7ca2f81 100644
--- a/solenv/bin/modules/installer/filelists.pm
+++ b/solenv/bin/modules/installer/filelists.pm
@@ -118,11 +118,24 @@ sub read_filelist
     foreach my $line (@{$content})
     {
         chomp $line;
-        foreach my $file (split /\s+(?=\/)/, $line)
+        if ($installer::globals::os eq "WNT") # FIXME hack
         {
-            if ($file ne "")
+            foreach my $file (split /\s+/, $line)
             {
-                push @filelist, $file;
+                if ($file ne "")
+                {
+                    push @filelist, $file;
+                }
+            }
+        }
+        else
+        {
+            foreach my $file (split /\s+(?=\/)/, $line)
+            {
+                if ($file ne "")
+                {
+                    push @filelist, $file;
+                }
             }
         }
     }