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

Fix "Unexpected EOF reading a line" error
2017-11-29 15:27:57 +01:00
parent b52846ab5b f986a44980
commit cd74a55afc
1 changed files with 2 additions and 2 deletions
@@ -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);
 }