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/gc.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/libstore/gc.cc') diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 3699b23440..8ce717aaff 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -602,6 +602,8 @@ void LocalStore::collectGarbage(GCAction action, const PathSet & pathsToDelete, } #endif + if (!pathExists(*i)) continue; + printMsg(lvlInfo, format("deleting `%1%'") % *i); /* Okay, it's safe to delete. */ -- cgit 1.4.1