aboutsummaryrefslogtreecommitdiff
path: root/src/nix-store
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-26 15:20:10 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-02-26 15:20:10 +0100
commitbcc9943cee4d4f62e0bceb4245d390fb60744eae (patch)
treefc322195d80765220900e7f128bc6f51d49f4b61 /src/nix-store
parent1042c10fd0417fe33dd879317f5d7a73aa6f7fe3 (diff)
importPaths(): Optionally add NARs to binary cache accessor
This enables an optimisation in hydra-queue-runner, preventing a download of a NAR it just uploaded to the cache when reading files like hydra-build-products.
Diffstat (limited to 'src/nix-store')
-rw-r--r--src/nix-store/nix-store.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 48c2865e5..a258c77c3 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -732,7 +732,7 @@ static void opImport(Strings opFlags, Strings opArgs)
if (!opArgs.empty()) throw UsageError("no arguments expected");
FdSource source(STDIN_FILENO);
- Paths paths = store->importPaths(requireSignature, source);
+ Paths paths = store->importPaths(requireSignature, source, 0);
for (auto & i : paths)
cout << format("%1%\n") % i << std::flush;
@@ -935,7 +935,7 @@ static void opServe(Strings opFlags, Strings opArgs)
case cmdImportPaths: {
if (!writeAllowed) throw Error("importing paths is not allowed");
- store->importPaths(false, in);
+ store->importPaths(false, in, 0);
out << 1; // indicate success
break;
}