whitespace
This commit is contained in:
parent
ff2903bf59
commit
8cb5363e94
@ -1,5 +1,5 @@
|
||||
# ex:ts=8 sw=4:
|
||||
# $OpenBSD: Port.pm,v 1.26 2012/03/02 19:33:43 espie Exp $
|
||||
# $OpenBSD: Port.pm,v 1.27 2012/04/10 17:06:15 espie Exp $
|
||||
#
|
||||
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
|
||||
#
|
||||
@ -334,7 +334,7 @@ sub run
|
||||
|
||||
my $sudo = OpenBSD::Paths->sudo;
|
||||
$self->handle_output($job);
|
||||
|
||||
|
||||
$self->junk_lock($core);
|
||||
my @d = $core->job->{builder}->locker->find_dependencies(
|
||||
$core->hostname);
|
||||
@ -495,7 +495,7 @@ sub new
|
||||
$class;
|
||||
|
||||
if ($builder->{rebuild}) {
|
||||
push(@{$job->{tasks}},
|
||||
push(@{$job->{tasks}},
|
||||
DPB::Task::Port::Signature->new('signature'));
|
||||
} else {
|
||||
$job->add_normal_tasks($builder->{dontclean}{$v->pkgpath});
|
||||
@ -636,7 +636,7 @@ sub watched
|
||||
my $stuck = $core->stuck_timeout;
|
||||
if (defined $stuck) {
|
||||
if ($diff > $stuck) {
|
||||
$self->{stuck} =
|
||||
$self->{stuck} =
|
||||
"KILLED: $self->{current} stuck at $msg";
|
||||
kill 9, $core->{pid};
|
||||
return $self->{stuck};
|
||||
@ -672,7 +672,7 @@ sub new
|
||||
builder => $builder, endcode => $e},
|
||||
$class;
|
||||
|
||||
push(@{$job->{tasks}},
|
||||
push(@{$job->{tasks}},
|
||||
DPB::Task::Port::Install->new('install'));
|
||||
return $job;
|
||||
}
|
||||
|
@ -1,5 +1,5 @@
|
||||
# ex:ts=8 sw=4:
|
||||
# $OpenBSD: PortBuilder.pm,v 1.20 2012/03/05 19:43:09 espie Exp $
|
||||
# $OpenBSD: PortBuilder.pm,v 1.21 2012/04/10 17:06:15 espie Exp $
|
||||
#
|
||||
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
|
||||
#
|
||||
@ -164,7 +164,7 @@ sub report
|
||||
if ($self->check($v)) {
|
||||
print $log "\n";
|
||||
open my $fh, '>>', $self->{state}{permanent_log};
|
||||
print $fh join(' ', $pkgpath, $host, $job->totaltime, $sz),
|
||||
print $fh join(' ', $pkgpath, $host, $job->totaltime, $sz),
|
||||
"\n";
|
||||
} else {
|
||||
open my $fh, '>>', $job->{log};
|
||||
@ -216,7 +216,7 @@ sub install
|
||||
{
|
||||
my ($self, $v, $core) = @_;
|
||||
my $log = $self->logger->make_logs($v);
|
||||
my $job = DPB::Job::Port::Install->new($log, $v, $self,
|
||||
my $job = DPB::Job::Port::Install->new($log, $v, $self,
|
||||
sub {$core->mark_ready; });
|
||||
$core->start_job($job, $v);
|
||||
return $core;
|
||||
|
Loading…
Reference in New Issue
Block a user