kloenk/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Fix "Unexpected EOF reading a line" error

Browse source 
propagated-user-env-packages files in nixpkgs aren't all terminated by
newlines, as buildenv expected. Now it does not require a terminating
newline; note that this introduces a behaviour change: propagated user
env packages may now be spread across multiple lines. However, nix
1.11.x still expects them to be on a single line so this shouldn't be
used in nixpkgs for now.
This commit is contained in:
Linus Heckemann 2017-11-29 11:36:28 +00:00
parent b52846ab5b
commit f986a44980
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; return;
throw SysError(format("opening '%1%'") % propagatedFN); 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()) if (done.find(p) == done.end())
postponed.insert(p); postponed.insert(p);
} }