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). --- scripts/download-using-manifests.pl.in | 58 ++++++++++++++++++++++++++++------ 1 file changed, 48 insertions(+), 10 deletions(-) (limited to 'scripts/download-using-manifests.pl.in') diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index 65ab36084..f963eead1 100644 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -22,16 +22,6 @@ my $tmpNar2 = "$tmpDir/nar2"; END { unlink $tmpNar; unlink $tmpNar2; rmdir $tmpDir; } -# Check the arguments. -die unless scalar @ARGV == 1; -my $targetPath = $ARGV[0]; - -my $date = strftime ("%F %H:%M:%S UTC", gmtime (time)); -print LOGFILE "$$ get $targetPath $date\n"; - -print "\n*** Trying to download/patch `$targetPath'\n"; - - # Load all manifests. my %narFiles; my %localPaths; @@ -46,6 +36,54 @@ for my $manifest (glob "$manifestDir/*.nixmanifest") { } +# Parse the arguments. + +if ($ARGV[0] eq "--query-paths") { + foreach my $storePath (keys %narFiles) { print "$storePath\n"; } + foreach my $storePath (keys %localPaths) { print "$storePath\n"; } + exit 0; +} + +elsif ($ARGV[0] eq "--query-info") { + shift @ARGV; + foreach my $storePath (@ARGV) { + my $info; + if (defined $narFiles{$storePath}) { + $info = @{$narFiles{$storePath}}[0]; + } + elsif (defined $localPaths{$storePath}) { + $info = @{$localPaths{$storePath}}[0]; + } + else { + next; # not an error + } + print "$storePath\n"; + print "$info->{deriver}\n"; + my @references = split " ", $info->{references}; + my $count = scalar @references; + print "$count\n"; + foreach my $reference (@references) { + print "$reference\n"; + } + } + exit 0; +} + +elsif ($ARGV[0] ne "--substitute") { + die "syntax: $0 [--query-paths | --query-info PATHS... | --substitute PATH]\n"; +} + + +die unless scalar @ARGV == 2; +my $targetPath = $ARGV[1]; + + +my $date = strftime ("%F %H:%M:%S UTC", gmtime (time)); +print LOGFILE "$$ get $targetPath $date\n"; + +print "\n*** Trying to download/patch `$targetPath'\n"; + + # If we can copy from a local path, do that. my $localPathList = $localPaths{$targetPath}; foreach my $localPath (@{$localPathList}) { -- cgit v1.2.3