From 40d9eb14dfb842c51e9f86818b43ae7711e1a5d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 22 Nov 2003 15:58:34 +0000 Subject: * Fix the garbage collector. --- scripts/nix-collect-garbage.in | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'scripts/nix-collect-garbage.in') diff --git a/scripts/nix-collect-garbage.in b/scripts/nix-collect-garbage.in index 9b471d896e60..d0552fd2f6e0 100755 --- a/scripts/nix-collect-garbage.in +++ b/scripts/nix-collect-garbage.in @@ -17,9 +17,24 @@ foreach my $arg (@ARGV) { else { die "unknown argument `$arg'" }; } +opendir(DIR, $linkdir) or die "cannot open directory $linkdir: $!"; +my @links = readdir DIR or die "cannot read directory $linkdir: $!"; +closedir DIR; + +my @roots; +foreach my $link (@links) { + $link = $linkdir . "/" . $link; + next if (!($link =~ /.id$/)); + open ROOT, "<$link" or die "cannot open $link: $!"; + my $root = ; + chomp $root; + close ROOT; + push @roots, $root; +} + my $extraarg = ""; if ($keepsuccessors) { $extraarg = "--include-successors"; }; -my $pid = open2(\*READ, \*WRITE, "nix --query --requisites $extraarg \$(cat $linkdir/*.id)") +my $pid = open2(\*READ, \*WRITE, "nix-store --query --requisites $extraarg @roots") or die "determining live paths"; close WRITE; while () { @@ -34,8 +49,8 @@ $? == 0 or die "determining live paths"; exit 0 if ($invert); -opendir(DIR, $storedir) or die "cannot opendir $storedir: $!"; -my @names = readdir(DIR); +opendir(DIR, $storedir) or die "cannot open directory $storedir: $!"; +my @names = readdir DIR; closedir DIR; foreach my $name (@names) { -- cgit 1.4.1