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

* Put WEXITSTATUS stuff somewhere else.

Browse source
This commit is contained in:
Eelco Dolstra 2004-06-22 11:03:41 +00:00
parent 84007a0958
commit 5e2cf44a4d
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/normalise.cc
View file

@ -501,7 +501,7 @@ void NormalisationGoal::buildDone()
debug(format("builder process for `%1%' finished") % nePath); debug(format("builder process for `%1%' finished") % nePath);
/* Check the exit status. */ /* Check the exit status. */
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { if (!statusOk(status)) {
deleteTmpDir(false); deleteTmpDir(false);
throw Error(format("builder for `%1%' %2%") throw Error(format("builder for `%1%' %2%")
% nePath % statusToString(status)); % nePath % statusToString(status));
@ -1371,7 +1371,7 @@ void SubstitutionGoal::finished()
debug(format("substitute for `%1%' finished") % storePath); debug(format("substitute for `%1%' finished") % storePath);
/* Check the exit status. */ /* Check the exit status. */
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) if (!statusOk(status))
throw Error(format("builder for `%1%' %2%") throw Error(format("builder for `%1%' %2%")
% storePath % statusToString(status)); % storePath % statusToString(status));

2
src/libstore/store.cc
View file

@ -161,7 +161,7 @@ void copyPath(const Path & src, const Path & dst)
/* Wait for the child to finish. */ /* Wait for the child to finish. */
int status = pid.wait(true); int status = pid.wait(true);
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) if (!statusOk(status))
throw Error(format("cannot copy `%1% to `%2%': child %3%") throw Error(format("cannot copy `%1% to `%2%': child %3%")
% src % dst % statusToString(status)); % src % dst % statusToString(status));
} }

6
src/libutil/util.cc
View file

@ -611,3 +611,9 @@ string statusToString(int status)
return "died abnormally"; return "died abnormally";
} else return "succeeded"; } else return "succeeded";
} }
bool statusOk(int status)
{
return WIFEXITED(status) && WEXITSTATUS(status) == 0;
}

2
src/libutil/util.hh
View file

@ -243,5 +243,7 @@ Strings unpackStrings(const string & s);
error string. */ error string. */
string statusToString(int status); string statusToString(int status);
bool statusOk(int status);
#endif /* !__UTIL_H */ #endif /* !__UTIL_H */