diff options
| author | Griffin Smith <grfn@gws.fyi> | 2020-08-14T02·06-0400 |
|---|---|---|
| committer | glittershark <grfn@gws.fyi> | 2020-08-14T03·06+0000 |
| commit | d1c38d9597e110bef92a548c86a651174bd385dc (patch) | |
| tree | 98d64ac81a4f7ca91ad21f732c84bdc3f73df9cb /third_party/nix/src/nix-env/nix-env.cc | |
| parent | aef3607bd332a9a6adbb150abe63250745972532 (diff) | |
refactor(tvix): Make Store::buildPaths return a Status r/1649
Make Store::buildPaths return a Status with [[nodiscard]] rather than throwing exceptions to signal failure. This is the beginning of a long road to refactor the entire store API to be status/statusor based instead of using exceptions. Change-Id: I2e32371c95a25b87ad129987c217d49c6d6e0c85 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1745 Tested-by: BuildkiteCI Reviewed-by: kanepyork <rikingcoding@gmail.com>
Diffstat (limited to 'third_party/nix/src/nix-env/nix-env.cc')
| -rw-r--r-- | third_party/nix/src/nix-env/nix-env.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/nix/src/nix-env/nix-env.cc b/third_party/nix/src/nix-env/nix-env.cc index a0fad3f3d1..396f65d0d6 100644 --- a/third_party/nix/src/nix-env/nix-env.cc +++ b/third_party/nix/src/nix-env/nix-env.cc @@ -23,6 +23,7 @@ #include "libstore/profiles.hh" #include "libstore/store-api.hh" #include "libutil/json.hh" +#include "libutil/status.hh" #include "libutil/util.hh" #include "libutil/xml-writer.hh" #include "nix-env/user-env.hh" @@ -720,8 +721,8 @@ static void opSet(Globals& globals, Strings opFlags, Strings opArgs) { if (globals.dryRun) { return; } - globals.state->store->buildPaths( - paths, globals.state->repair != 0u ? bmRepair : bmNormal); + nix::util::OkOrThrow(globals.state->store->buildPaths( + paths, globals.state->repair != 0u ? bmRepair : bmNormal)); } else { printMissing(globals.state->store, {drv.queryOutPath()}); if (globals.dryRun) { |