picnoir/nix-gh
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1704 from lheckemann/buildenv-eol-fix

Browse source 
Fix "Unexpected EOF reading a line" error
This commit is contained in:
Eelco Dolstra 2017-11-29 15:27:57 +01:00 committed by GitHub
parent b52846ab5b f986a44980
commit cd74a55afc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/buildenv/buildenv.cc
View file

@ -115,9 +115,9 @@ static void addPkg(const Path & pkgDir, int priority)
return;
throw SysError(format("opening '%1%'") % propagatedFN);
}
propagated = readLine(fd.get());
propagated = readFile(fd.get());
}
for (const auto & p : tokenizeString<std::vector<string>>(propagated, " "))
for (const auto & p : tokenizeString<std::vector<string>>(propagated, " \n"))
if (done.find(p) == done.end())
postponed.insert(p);
}