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

* Input sources should be in the set of all referenceable paths too.

Browse source
This commit is contained in:
Eelco Dolstra 2005-02-11 16:03:47 +00:00
parent 3a99616968
commit 80870d9291
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/libstore/build.cc
View file

@ -903,15 +903,15 @@ bool DerivationGoal::prepareBuild()
% drvPath % *j % i->first); % drvPath % *j % i->first);
} }
debug(format("added input paths %1%") % showPaths(inputPaths));
allPaths.insert(inputPaths.begin(), inputPaths.end());
/* Second, the input sources. */ /* Second, the input sources. */
for (PathSet::iterator i = drv.inputSrcs.begin(); for (PathSet::iterator i = drv.inputSrcs.begin();
i != drv.inputSrcs.end(); ++i) i != drv.inputSrcs.end(); ++i)
computeFSClosure(*i, inputPaths); computeFSClosure(*i, inputPaths);
debug(format("added input paths %1%") % showPaths(inputPaths));
allPaths.insert(inputPaths.begin(), inputPaths.end());
return true; return true;
} }

4
src/libstore/references.cc
View file

@ -34,6 +34,8 @@ void checkPath(const string & path,
{ {
checkInterrupt(); checkInterrupt();
debug(format("checking `%1%'") % path);
struct stat st; struct stat st;
if (lstat(path.c_str(), &st)) if (lstat(path.c_str(), &st))
throw SysError(format("getting attributes of path `%1%'") % path); throw SysError(format("getting attributes of path `%1%'") % path);
@ -48,8 +50,6 @@ void checkPath(const string & path,
else if (S_ISREG(st.st_mode)) { else if (S_ISREG(st.st_mode)) {
debug(format("checking `%1%'") % path);
AutoCloseFD fd = open(path.c_str(), O_RDONLY); AutoCloseFD fd = open(path.c_str(), O_RDONLY);
if (fd == -1) throw SysError(format("opening file `%1%'") % path); if (fd == -1) throw SysError(format("opening file `%1%'") % path);