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

tweak the carp stuff to not recurse into itself, so that compile errors

Browse Source 
show up correctly again.

split start_cores into a read_config/start_cores part, so that read_config
can happen right after handle_options, and so that we can put more options
in the hosts file (to be done)
This commit is contained in:
espie 2013-03-03 00:51:57 +00:00
parent 7f4f59118d
commit 47036c8aec
1 changed files with 48 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
infrastructure/bin/dpb
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: dpb,v 1.85 2013/02/04 09:43:57 espie Exp $
# $OpenBSD: dpb,v 1.86 2013/03/03 00:51:57 espie Exp $
#
# Copyright (c) 2010 Marc Espie <espie@openbsd.org>
#
@ -19,13 +19,46 @@
use strict;
use warnings;
my $ports1;
my ($ports1, $olddie, $oldwarn, $reporter);
use FindBin;
BEGIN {
$ports1 = $ENV{PORTSDIR} || '/usr/ports';
}
use lib ("$ports1/infrastructure/lib", "$FindBin::Bin/../lib");
# inspired by Carp::Always
$olddie = $SIG{__DIE__};
$oldwarn = $SIG{__WARN__};
$SIG{__WARN__} = sub {
require Carp;
my $_ = pop @_;
s/(.*)( at .*? line .*?\n$)/$1/s;
push @_, $_;
$SIG{__WARN__} = $oldwarn;
if (defined $reporter) {
$reporter->myprint(&Carp::longmess);
} else {
warn &Carp::longmess;
}
};
$SIG{__DIE__} = sub {
require Carp;
my $_ = pop @_;
s/(.*)( at .*? line .*?\n$)/$1/s;
push @_, $_;
if (defined $reporter) {
$reporter->reset_cursor;
}
$SIG{__DIE__} = $olddie;
die &Carp::longmess;
};
}
END {
$SIG{__DIE__} = $olddie;
$SIG{__WARN__} = $oldwarn;
}
use lib ("$ports1/infrastructure/lib", "$FindBin::Bin/../lib");
package DPB::State;
our @ISA = qw(OpenBSD::State);
@ -248,9 +281,10 @@ sub handle_options
$state->{build_once} = 0;
}
$state->{concurrent} = $state->{logger}->open("concurrent");
$state->parse_config_files;
}
sub start_cores
sub parse_config_files
{
my $state = shift;
@ -292,7 +326,7 @@ sub start_cores
$override_prop->{mem} = $state->opt('M');
}
my $default_prop = {
my $default_prop = {
junk => 150,
parallel => '/2',
wait_timeout => 600,
@ -303,10 +337,16 @@ sub start_cores
DPB::Core->parse_hosts_file($state->{config}, $state,
$default_prop, $override_prop);
}
$state->{default_prop} = $default_prop;
$state->{override_prop} = $override_prop;
}
sub start_cores
{
my $state = shift;
if (!$state->{config}) {
my $prop = { %$default_prop };
while (my ($k, $v) = each %$override_prop) {
my $prop = { %{$state->{default_prop}} };
while (my ($k, $v) = each %{$state->{override_prop}}) {
$prop->{$k} = $v;
}
@ -543,34 +583,6 @@ sub report
"\n";
}
my $reporter;
# inspired by Carp::Always
$SIG{__WARN__} = sub {
require Carp;
my $_ = pop @_;
s/(.*)( at .*? line .*?\n$)/$1/s;
push @_, $_;
if (defined $reporter) {
$reporter->myprint(&Carp::longmess);
} else {
warn &Carp::longmess;
}
};
$SIG{__DIE__} = sub {
require Carp;
my $_ = pop @_;
s/(.*)( at .*? line .*?\n$)/$1/s;
push @_, $_;
if (defined $reporter) {
$reporter->reset_cursor;
}
die &Carp::longmess;
};
$SIG{INFO} = sub {
print "Trace:\n";
my $x = 1;