diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-10-29 18:58:44 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-10-29 19:00:04 +0100 |
| commit | 3b6f8795853a61869de08e627db86e567656939d (patch) | |
| tree | 809c51803b6a5a4cc25e4a9a52becbba9086d834 /solenv | |
| parent | 3a88f8de3cc6175907c584b848dd06391ee9d8fa (diff) | |
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
Diffstat (limited to 'solenv')
| -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}) { |