Kaydet (Commit) 3b6f8795 authored tarafından Christian Lohmaier's avatar Christian Lohmaier

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
üst 3a88f8de
......@@ -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})
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment