nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-21 09:49:36 +01:00
Code Activity

Merge pull request #3182 from bhipple/fixup/comments

Browse source 
Minor updates to inline comments
This commit is contained in:
Eelco Dolstra 2019-10-31 14:14:35 +01:00 • committed by GitHub
commit 6bff1aa46d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/build.cc
View file

@ -3264,8 +3264,7 @@ void DerivationGoal::registerOutputs()
i.second.parseHashInfo(recursive, h);
if (!recursive) {
/* The output path should be a regular file without
execute permission. */
/* The output path should be a regular file without execute permission. */
if (!S_ISREG(st.st_mode) || (st.st_mode & S_IXUSR) != 0)
throw BuildError(
format("output path '%1%' should be a non-executable regular file") % path);
@ -3343,8 +3342,7 @@ void DerivationGoal::registerOutputs()
% drvPath % path);
}
/* Since we verified the build, it's now ultimately
trusted. */
/* Since we verified the build, it's now ultimately trusted. */
if (!info.ultimate) {
info.ultimate = true;
worker.store.signPathInfo(info);
@ -3354,8 +3352,7 @@ void DerivationGoal::registerOutputs()
continue;
}
/* For debugging, print out the referenced and unreferenced
paths. */
/* For debugging, print out the referenced and unreferenced paths. */
for (auto & i : inputPaths) {
PathSet::iterator j = references.find(i);
if (j == references.end())
@ -3413,8 +3410,7 @@ void DerivationGoal::registerOutputs()
}
}
/* If this is the first round of several, then move the output out
of the way. */
/* If this is the first round of several, then move the output out of the way. */
if (nrRounds > 1 && curRound == 1 && curRound < nrRounds && keepPreviousRound) {
for (auto & i : drv->outputs) {
Path prev = i.second.path + checkSuffix;

3
src/libstore/local-store.cc
View file

@ -937,8 +937,7 @@ void LocalStore::registerValidPaths(const ValidPathInfos & infos)
not be valid yet. */
for (auto & i : infos)
if (isDerivation(i.path)) {
// FIXME: inefficient; we already loaded the
// derivation in addValidPath().
// FIXME: inefficient; we already loaded the derivation in addValidPath().
Derivation drv = readDerivation(realStoreDir + "/" + baseNameOf(i.path));
checkDerivationOutputs(i.path, drv);
}