maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove more tabs

Browse source
This commit is contained in:
Eelco Dolstra 2012-07-27 10:56:33 -04:00
parent 3a8f841612
commit fbf59d95f6
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/libstore/build.cc
View file

@ -2179,8 +2179,8 @@ void DerivationGoal::deleteTmpDir(bool force)
{ {
if (tmpDir != "") { if (tmpDir != "") {
if (keepFailed && !force) { if (keepFailed && !force) {
printMsg(lvlError, printMsg(lvlError,
format("builder for `%1%' failed; keeping build directory `%2%'") format("builder for `%1%' failed; keeping build directory `%2%'")
% drvPath % tmpDir); % drvPath % tmpDir);
if (buildUser.enabled() && !amPrivileged()) if (buildUser.enabled() && !amPrivileged())
getOwnership(tmpDir); getOwnership(tmpDir);
@ -2838,9 +2838,9 @@ void Worker::waitForInput()
/* If a global timeout has been set, sleep until it's done. */ /* If a global timeout has been set, sleep until it's done. */
if (buildTimeout != 0) { if (buildTimeout != 0) {
useTimeout = true; useTimeout = true;
if (lastWait == 0 || lastWait > before) lastWait = before; if (lastWait == 0 || lastWait > before) lastWait = before;
timeout.tv_sec = std::max((time_t) 0, lastWait + buildTimeout - before); timeout.tv_sec = std::max((time_t) 0, lastWait + buildTimeout - before);
} }
/* If we're monitoring for silence on stdout/stderr, sleep until /* If we're monitoring for silence on stdout/stderr, sleep until
@ -2854,10 +2854,10 @@ void Worker::waitForInput()
} }
} }
if (oldest) { if (oldest) {
time_t silenceTimeout = std::max((time_t) 0, oldest + maxSilentTime - before); time_t silenceTimeout = std::max((time_t) 0, oldest + maxSilentTime - before);
timeout.tv_sec = useTimeout timeout.tv_sec = useTimeout
? std::min(silenceTimeout, timeout.tv_sec) ? std::min(silenceTimeout, timeout.tv_sec)
: silenceTimeout; : silenceTimeout;
useTimeout = true; useTimeout = true;
printMsg(lvlVomit, format("sleeping %1% seconds") % timeout.tv_sec); printMsg(lvlVomit, format("sleeping %1% seconds") % timeout.tv_sec);
} }
@ -2948,8 +2948,8 @@ void Worker::waitForInput()
goal->cancel(); goal->cancel();
} }
if (buildTimeout != 0 && if (buildTimeout != 0 &&
after - before >= (time_t) buildTimeout) after - before >= (time_t) buildTimeout)
{ {
printMsg(lvlError, printMsg(lvlError,
format("%1% timed out after %2% seconds of activity") format("%1% timed out after %2% seconds of activity")