solenv/bin/modules/installer/filelists.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
New commits: commit 3b6f8795853a61869de08e627db86e567656939d Author: Christian Lohmaier <[email protected]> Date: Thu Oct 29 18:58:44 2015 +0100 filelist-split: reading dos files under cygwin retains \r\n so \r needs to be taken care of in the split-regex as well Change-Id: I834d8dcb95b48bbe6c8fa034d5621f006c0dcef8 diff --git a/solenv/bin/modules/installer/filelists.pm b/solenv/bin/modules/installer/filelists.pm index 9c168c7..41d3ea3 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}) { _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
