From b1a26e6caa1eee0d6c991d34bcacf19eba7f3a77 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 3 Oct 2013 13:07:32 +0200 Subject: [PATCH] Revert "Add a dependency_lookup configuration option to enable (slow) dependency lookup in queue. This behaviour was disabled temporarily in accefbb79 due to slowness in very large queues, but some people might be dependent on it, so it is configurable until the previous behaviour is implemented more efficiently." This reverts commit 24f5a6b15ff148ac339918a998aa1291ad2c933f. --- src/script/hydra-queue-runner | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/script/hydra-queue-runner b/src/script/hydra-queue-runner index 6162c9bc..370ea7e2 100755 --- a/src/script/hydra-queue-runner +++ b/src/script/hydra-queue-runner @@ -19,7 +19,6 @@ my $lastTime; #$SIG{CHLD} = 'IGNORE'; -my $config = getHydraConfig(); sub unlockDeadBuilds { # Unlock builds whose building process has died. @@ -49,7 +48,7 @@ sub unlockDeadBuilds { # depends; or undef if no such build exists. sub findBuildDependencyInQueue { my ($buildsByDrv, $build) = @_; - return undef if !($config->{dependency_lookup} // 0); # FIXME + return undef; # FIXME return undef unless isValidPath($build->drvpath); my @deps = grep { /\.drv$/ && $_ ne $build->drvpath } computeFSClosure(0, 0, $build->drvpath); return unless scalar @deps > 0;