diff options
| -rw-r--r-- | solenv/bin/modules/installer/filelists.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm index 9c168c78472f..41d3ea3fd895 100644 --- a/solenv/bin/modules/installer/filelists.pm +++ b/solenv/bin/modules/installer/filelists.pm @@ -117,8 +117,9 @@ sub read_filelist # split on space, but only if followed by / (don't split within a filename) my $splitRE = qr!\s+(?=/)!; - # filelist on win have C:/cygwin style however - $splitRE = qr!\s+(?=[A-Z]:/)! if ($installer::globals::os eq "WNT"); + # filelist on win have C:/cygwin style however - also reading dos-file under + # cygwin retains \r\n - so chomp below still leaves \r to strip in the RE + $splitRE = qr!\s+(?:$|(?=[A-Z]:/))! if ($installer::globals::os eq "WNT"); foreach my $line (@{$content}) { |