about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2017-11-29T14·27+0100
committerGitHub <noreply@github.com>2017-11-29T14·27+0100
commitcd74a55afc31638940d5b6a011afc3a4ebedec9d (patch)
tree83422f941aa3c5cc7f069239044f3298704e3022
parentb52846ab5b5d1317a6f7a5967e35b360a731b9c6 (diff)
parentf986a44980742ce74b6fd3321696f6b4937f696b (diff)
Merge pull request #1704 from lheckemann/buildenv-eol-fix
Fix "Unexpected EOF reading a line" error
-rw-r--r--src/buildenv/buildenv.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/buildenv/buildenv.cc b/src/buildenv/buildenv.cc
index f05aa7bf2fbb..eddb9fdaa8d2 100644
--- a/src/buildenv/buildenv.cc
+++ b/src/buildenv/buildenv.cc
@@ -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);
 }