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

revisit, fetch cores MUST be pre-emptable for rebuilding-info,

Browse Source 
otherwise pure -F fetch engine loses !
This commit is contained in:
espie 2013-10-07 20:01:55 +00:00
parent 0fd016ecd3
commit 37f400f8fb
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infrastructure/lib/DPB/Config.pm
View File

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Config.pm,v 1.14 2013/10/07 19:27:25 espie Exp $
# $OpenBSD: Config.pm,v 1.15 2013/10/07 20:01:55 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -75,6 +75,7 @@ sub parse_command_line
$state->{fetch_only} = 1;
$state->{opt}{f} = $state->{opt}{F};
$state->{opt}{j} = 1;
$state->{opt}{e} = 1;
}
if (defined $state->opt('j')) {
if ($state->localarch ne $state->arch) {

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

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: SubEngine.pm,v 1.12 2013/10/07 18:01:33 espie Exp $
# $OpenBSD: SubEngine.pm,v 1.13 2013/10/07 20:01:55 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -147,6 +147,12 @@ sub start
sub preempt_core
{
my ($self, $core) = @_;
if (@{$self->{engine}{requeued}} > 0) {
$self->{engine}->rebuild_info($core);
return 1;
}
return 0;
}

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

@ -1,5 +1,5 @@
# ex:ts=8 sw=4:
# $OpenBSD: Build.pm,v 1.4 2013/10/07 18:01:33 espie Exp $
# $OpenBSD: Build.pm,v 1.5 2013/10/07 20:01:56 espie Exp $
#
# Copyright (c) 2010-2013 Marc Espie <espie@openbsd.org>
#
@ -34,8 +34,7 @@ sub preempt_core
{
my ($self, $core) = @_;
if (@{$self->{engine}{requeued}} > 0) {
$self->{engine}->rebuild_info($core);
if ($self->SUPER::preempt_core($core)) {
return 1;
}
if ($self->start_install($core)) {