From 2269ffdd0e1d5471bb4363737104d642fa633f70 Mon Sep 17 00:00:00 2001 From: espie Date: Fri, 11 Jan 2013 15:48:51 +0000 Subject: [PATCH] run handle_job earlier, so we can see which junk_locks occurred in setup. --- infrastructure/lib/DPB/Job/Port.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/infrastructure/lib/DPB/Job/Port.pm b/infrastructure/lib/DPB/Job/Port.pm index 626701a2260..7561b43d74c 100644 --- a/infrastructure/lib/DPB/Job/Port.pm +++ b/infrastructure/lib/DPB/Job/Port.pm @@ -1,5 +1,5 @@ # ex:ts=8 sw=4: -# $OpenBSD: Port.pm,v 1.68 2013/01/11 15:35:53 espie Exp $ +# $OpenBSD: Port.pm,v 1.69 2013/01/11 15:48:51 espie Exp $ # # Copyright (c) 2010 Marc Espie # @@ -332,8 +332,8 @@ sub run my $job = $core->job; my $dep = $job->{depends}; - $self->junk_lock($core); $self->handle_output($job); + $self->junk_lock($core); my @cmd = ('/usr/sbin/pkg_add', '-aI'); if ($job->{builder}->{update}) { push(@cmd, "-rqU", "-Dupdate", "-Dupdatedepends"); @@ -439,12 +439,12 @@ sub run my $job = $core->job; my $v = $job->{v}; + $self->handle_output($job); $self->junk_lock($core); # we got pre-empted if ($core->prop->{junk_count} < $core->prop->{junk}) { exit(2); } - $self->handle_output($job); my $h = $job->{builder}->locker->find_dependencies( $core->hostname);