diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-03-27 19:02:22 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-05-30 13:29:50 +0200 |
| commit | 1672bcd230447f1ce0c3291950bdd9a662cee974 (patch) | |
| tree | 801f04697c490bd0d01382c4d2ee522179a5b9a3 /src/libexpr/primops | |
| parent | c1d445ececa4ea17bd5b5bff3d5fb3515be723cb (diff) | |
Move evaluator-specific settings out of libstore
Diffstat (limited to 'src/libexpr/primops')
| -rw-r--r-- | src/libexpr/primops/fetchGit.cc | 2 | ||||
| -rw-r--r-- | src/libexpr/primops/fetchMercurial.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libexpr/primops/fetchGit.cc b/src/libexpr/primops/fetchGit.cc index 8bb74dad6..7aa98e0bf 100644 --- a/src/libexpr/primops/fetchGit.cc +++ b/src/libexpr/primops/fetchGit.cc @@ -28,7 +28,7 @@ GitInfo exportGit(ref<Store> store, const std::string & uri, std::experimental::optional<std::string> ref, std::string rev, const std::string & name) { - if (settings.pureEval && rev == "") + if (evalSettings.pureEval && rev == "") throw Error("in pure evaluation mode, 'fetchGit' requires a Git revision"); if (!ref && rev == "" && hasPrefix(uri, "/") && pathExists(uri + "/.git")) { diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc index a75c5fc2d..9d35f6d0d 100644 --- a/src/libexpr/primops/fetchMercurial.cc +++ b/src/libexpr/primops/fetchMercurial.cc @@ -27,7 +27,7 @@ std::regex commitHashRegex("^[0-9a-fA-F]{40}$"); HgInfo exportMercurial(ref<Store> store, const std::string & uri, std::string rev, const std::string & name) { - if (settings.pureEval && rev == "") + if (evalSettings.pureEval && rev == "") throw Error("in pure evaluation mode, 'fetchMercurial' requires a Mercurial revision"); if (rev == "" && hasPrefix(uri, "/") && pathExists(uri + "/.hg")) { |