diff options
author | Michael Stahl <mstahl@redhat.com> | 2015-10-29 12:12:40 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-10-29 13:19:25 +0100 |
commit | b051510796dcf289edcd03737087176e53bbe4b8 (patch) | |
tree | fc5b08e674df6067be9efb32cbac4652dd367a4a | |
parent | df046ebf9b4d0578b4b59675817db75298cb1fc0 (diff) |
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
-rw-r--r-- | solenv/bin/modules/installer/filelists.pm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm index c723166775f9..7ca2f8104c32 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; + } } } } |