diff options
| author | Ben Burdette <bburdette@gmail.com> | 2020-05-29 09:51:37 -0600 |
|---|---|---|
| committer | Ben Burdette <bburdette@gmail.com> | 2020-05-29 09:51:37 -0600 |
| commit | 734283d636318b6dfc249afe1ddbb20bb4d02ed4 (patch) | |
| tree | 1528b42a7c0017b674caec2deccaaa99ca9b856d /src/libstore/derivations.cc | |
| parent | 92123c6c798682f3a7c1f19984dcd3a06ad6be92 (diff) | |
| parent | f60ce4fa207a210e23a1142d3a8ead611526e6e1 (diff) | |
Merge remote-tracking branch 'upstream/master' into errors-phase-2
Diffstat (limited to 'src/libstore/derivations.cc')
| -rw-r--r-- | src/libstore/derivations.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc index 852667468..5c7e41eeb 100644 --- a/src/libstore/derivations.cc +++ b/src/libstore/derivations.cc @@ -9,13 +9,13 @@ namespace nix { -void DerivationOutput::parseHashInfo(bool & recursive, Hash & hash) const +void DerivationOutput::parseHashInfo(FileIngestionMethod & recursive, Hash & hash) const { - recursive = false; + recursive = FileIngestionMethod::Flat; string algo = hashAlgo; if (string(algo, 0, 2) == "r:") { - recursive = true; + recursive = FileIngestionMethod::Recursive; algo = string(algo, 2); } |