aboutsummaryrefslogtreecommitdiff
path: root/src/libstore/build.cc
diff options
context:
space:
mode:
authorBenjamin Hipple <bhipple@protonmail.com>2019-10-27 13:45:02 -0400
committerBenjamin Hipple <bhipple@protonmail.com>2019-10-31 05:56:37 -0400
commit80d5ec6ff4388b258278ee507b94694dc34d19f5 (patch)
treebf01e6900cd300abdb7d40c02c8e33b365a148bb /src/libstore/build.cc
parente5319a87ce75bbd2dd88f57c3b470a396195e849 (diff)
Minor updates to inline comments
Add missing docstring on InstallableCommand. Also, some of these were wrapped when they're right next to a line longer than the unwrapped line, so we can just unwrap them to save vertical space.
Diffstat (limited to 'src/libstore/build.cc')
-rw-r--r--src/libstore/build.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index dfae8024a..ada1cf8ec 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -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;