From 66a3ac6a56cfa70e2ffeb911c1286ba84c2fa048 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 27 Jul 2012 18:16:05 -0400
Subject: Allow a binary cache to declare that it doesn't support "nix-env
 -qas"

Querying all substitutable paths via "nix-env -qas" is potentially
hard on a server, since it involves sending thousands of HEAD
requests.  So a binary cache must now have a meta-info file named
"nix-cache-info" that specifies whether the server wants this.  It
also specifies the store prefix so that we don't send useless queries
to a binary cache for a different store prefix.
---
 tests/binary-cache.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'tests')

diff --git a/tests/binary-cache.sh b/tests/binary-cache.sh
index b6951dd1351e..8c1138210412 100644
--- a/tests/binary-cache.sh
+++ b/tests/binary-cache.sh
@@ -10,13 +10,26 @@ outPath=$(nix-build dependencies.nix --no-out-link)
 
 nix-push --dest $cacheDir $outPath
 
-# Check that downloading works.
+
+# By default, a binary cache doesn't support "nix-env -qas", but does
+# support installation.
 clearStore
 rm -f $NIX_STATE_DIR/binary-cache*
 
+NIX_BINARY_CACHES="file://$cacheDir" nix-env -f dependencies.nix -qas \* | grep -- "---"
+
+NIX_BINARY_CACHES="file://$cacheDir" nix-store -r $outPath
+
+
+# But with the right configuration, "nix-env -qas" should also work.
+clearStore
+rm -f $NIX_STATE_DIR/binary-cache*
+echo "WantMassQuery: 1" >> $cacheDir/nix-cache-info
+
 NIX_BINARY_CACHES="file://$cacheDir" nix-env -f dependencies.nix -qas \* | grep -- "--S"
 
 NIX_BINARY_CACHES="file://$cacheDir" nix-store -r $outPath
 
 nix-store --check-validity $outPath
 nix-store -qR $outPath | grep input-2
+
-- 
cgit 1.4.1