From 9e975458b48d9eb041a6484c634be2ee8ee1649d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 12 Aug 2007 00:29:28 +0000 Subject: * Get rid of the substitutes database table (NIX-47). Instead, if we need any info on substitutable paths, we just call the substituters (such as download-using-manifests.pl) directly. This means that it's no longer necessary for nix-pull to register substitutes or for nix-channel to clear them, which makes those operations much faster (NIX-95). Also, we don't have to worry about keeping nix-pull manifests (in /nix/var/nix/manifests) and the database in sync with each other. The downside is that there is some overhead in calling an external program to get the substitutes info. For instance, "nix-env -qas" takes a bit longer. Abolishing the substitutes table also makes the logic in local-store.cc simpler, as we don't need to store info for invalid paths. On the downside, you cannot do things like "nix-store -qR" on a substitutable but invalid path (but nobody did that anyway). * Never catch interrupts (the Interrupted exception). --- src/libstore/misc.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libstore/misc.cc') diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc index 1319245c057c..25529d8bac67 100644 --- a/src/libstore/misc.cc +++ b/src/libstore/misc.cc @@ -63,8 +63,7 @@ void queryMissing(const PathSet & targets, bool mustBuild = false; for (DerivationOutputs::iterator i = drv.outputs.begin(); i != drv.outputs.end(); ++i) - if (!store->isValidPath(i->second.path) && - !store->hasSubstitutes(i->second.path)) + if (!store->isValidPath(i->second.path) && !store->hasSubstitutes(i->second.path)) mustBuild = true; if (mustBuild) { @@ -83,8 +82,8 @@ void queryMissing(const PathSet & targets, if (store->isValidPath(p)) continue; if (store->hasSubstitutes(p)) willSubstitute.insert(p); - PathSet refs; - store->queryReferences(p, todo); + // XXX call the substituters + // store->queryReferences(p, todo); } } } -- cgit 1.4.1