aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2016-10-26 15:02:38 +0200
committerEelco Dolstra <edolstra@gmail.com>2016-10-26 15:02:38 +0200
commitd2c58ba60572e4248bd52f82fac57d6e0c79773d (patch)
tree9f2c0d43940dfb9339f868e72495c3e414db156b
parentfdbbcc44924cb4d9028fa68b2f7d423fb5d8670f (diff)
Restore the CachedFailure status code
The removal of CachedFailure caused the value of TimedOut to change, which broke timed-out handling in Hydra (so timed-out builds would show up as "aborted" and would be retried, e.g. at http://hydra.nixos.org/build/42537427).
-rw-r--r--src/libstore/store-api.hh4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 94dc8ab1a..3057106ec 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -188,6 +188,9 @@ enum BuildMode { bmNormal, bmRepair, bmCheck, bmHash };
struct BuildResult
{
+ /* Note: don't remove status codes, and only add new status codes
+ at the end of the list, to prevent client/server
+ incompatibilities in the nix-store --serve protocol. */
enum Status {
Built = 0,
Substituted,
@@ -196,6 +199,7 @@ struct BuildResult
InputRejected,
OutputRejected,
TransientFailure, // possibly transient
+ CachedFailure, // no longer used
TimedOut,
MiscFailure,
DependencyFailed,