cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prevent infinite recursion

Browse Source
This commit is contained in:
espie 2018-09-05 09:16:19 +00:00
parent b438c97fa0
commit ad0ba6e372
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
infrastructure/lib/DPB/SubEngine.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: SubEngine.pm,v 1.25 2015/06/22 12:18:50 espie Exp $
# $OpenBSD: SubEngine.pm,v 1.26 2018/09/05 09:16:19 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -142,7 +142,7 @@ sub lock_and_start_build
sub use_core
{
my ($self, $core) = @_;
my ($self, $core, $rechecked) = @_;
if ($self->preempt_core($core)) {
return 1;
}
@ -160,7 +160,7 @@ sub use_core
return 1;
}
}
if ($self->recheck_mismatches($core)) {
if (!$rechecked && $self->recheck_mismatches($core)) {
return 1;
}
return 0;
@ -191,7 +191,7 @@ sub start
my $self = shift;
my $core = $self->get_core;
if ($self->use_core($core)) {
if ($self->use_core($core, 0)) {
return 1;
} else {
$core->mark_ready;

4
infrastructure/lib/DPB/SubEngine/Build.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Build.pm,v 1.20 2018/07/18 10:49:05 espie Exp $
# $OpenBSD: Build.pm,v 1.21 2018/09/05 09:16:19 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -171,7 +171,7 @@ sub recheck_mismatches
# let's make sure we don't have something else first
if (@{$self->{mismatches}} > 0) {
if ($self->{engine}->check_buildable(1)) {
return $self->use_core($core);
return $self->use_core($core, 1);
}
}
# second pass, affinity mismatches