use DBI;
use lib '/org/wanna-build/bin';
use lib '/org/wanna-build/lib';
+#use lib 'lib';
use WannaBuild;
use YAML::Tiny;
use Data::Dumper;
$category, %catval, %short_category,
$short_date, $list_min_age, $dbbase, @curr_time,
$build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc,
- $printformat, $ownprintformat, $privmode
+ $printformat, $ownprintformat, $privmode, $extra_depends, $extra_conflicts
);
our $Pas = '/org/buildd.debian.org/etc/packages-arch-specific/Packages-arch-specific';
our $simulate = 0;
+our $simulate_edos = 0;
our $api = 0; # allow buildds to specify an different api
# global vars
"give-back-build" => "set-needs-build",
"dep-wait-build" => "set-dep-wait",
"forget-build" => "forget",
- "merge-quinn" => "merge-quinn",
- "merge-packages" => "merge-packages",
- "merge-sources" => "merge-sources",
"build-info" => "info" );
%short_category = ( u => "uploaded-fixed-pkg",
my %options =
(# flags
simulate => { flag => \$simulate }, # this is not supported by all operations (yet)!
+ "simulate-edos" => { flag => \$simulate_edos },
+ "simulate-all" => { code => sub { $simulate = 1; $simulate_edos = 1; } },
api => { arg => \$api, code => sub {
# official apis are numeric
die "$api isn't numeric" unless int($api) eq $api;
"dep-wait" => { mode => "set-dep-wait" },
forget => { mode => "forget" },
'forget-user' => { mode => 'forget-user' },
- "merge-quinn" => { mode => "merge-quinn" },
- "merge-partial-quinn" => { mode => "merge-partial-quinn" },
- "merge-packages" => { mode => "merge-packages" },
- "merge-sources" => { mode => "merge-sources" },
+ update => { mode => "set-update" },
+ #"merge-quinn" => { mode => "merge-quinn" },
+ #"merge-partial-quinn" => { mode => "merge-partial-quinn" },
+ #"merge-packages" => { mode => "merge-packages" },
+ #"merge-sources" => { mode => "merge-sources" },
"pretend-avail" => { short => "p", mode => "pretend-avail" },
- "merge-all" => { mode => "merge-all" },
- "merge-all-secondary" => { mode => "merge-all-secondary" },
+ #"merge-all" => { mode => "merge-all" },
+ #"merge-all-secondary" => { mode => "merge-all-secondary" },
"merge-v3" => { mode => "merge-v3" },
info => { short => "i", mode => "info" },
'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver,
"format" => { arg => \$printformat },
"own-format" => { arg => \$ownprintformat },
"Pas" => { arg => \$Pas },
+ "extra-depends"=> { arg => \$extra_depends },
+ "extra-conflicts"=> { arg => \$extra_conflicts },
# special actions
export => { arg => \$export_to, mode => "export" },
import => { arg => \$import_from, mode => "import" },
}
my $schema_suffix = '';
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/) && !($privmode eq 'yes')) {
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /buildd-/) && !($privmode eq 'yes')) {
$dbh = DBI->connect("DBI:Pg:service=wanna-build") ||
die "FATAL: Cannot open database: $DBI::errstr\n";
$schema_suffix = '_public';
}
parse_all_v3($$srcs, {'arch' => $arch, 'suite' => $distribution, 'time' => $curr_date});
@bpkgs = @ipkgs unless @bpkgs;
- call_edos_depcheck( {'arch' => $arch, 'pkgs' => @bpkgs, 'srcs' => $$srcs, 'depwait' => 1 });
+ call_edos_depcheck( {'arch' => $arch, 'pkgs' => \@bpkgs, 'srcs' => $$srcs, 'depwait' => 1 });
last SWITCH;
};
/^import/ && do {
die "Unexpected operation mode $op_mode\n";
}
- if (not -t and $user =~ /-/) {
+ if (not -t and $user =~ /buildd-/) {
my $userinfo = get_user_info($user);
if (!defined $userinfo)
{
elsif ($op_mode eq "set-binary-nmu") {
set_one_binnmu( $name, $version );
}
+ elsif ($op_mode eq "set-update") {
+ set_one_update( $name, $version );
+ }
}
}
} else {
print "- $name:\n";
print " - status: ok\n";
+ print " - extra-depends: $pkg->{'extra_depends'}\n" if $pkg->{'extra_depends'};
+ print " - extra-conflicts: $pkg->{'extra_conflicts'}\n" if $pkg->{'extra_conflicts'};
if ($pkg->{'binary_nmu_version'}) {
print " - binNMU:\n";
print " - version: $pkg->{'binary_nmu_version'}\n";
print "$name: registered as waiting for dependencies\n" if $verbose;
}
+sub set_one_update {
+ my $name = shift;
+ my $version = shift;
+ my $pkg = get_source_info($name);
+
+ if (!defined($pkg)) {
+ print "$name: not registered yet.\n";
+ return;
+ }
+ $pkg->{'version'} =~ s/\+b[0-9]+$//;
+
+ log_ta( $pkg, "--update" );
+ update_source_info($pkg);
+}
+
sub parse_sources {
my %pkgs;
# filter components
@list = grep { my $i = $_->{'component'}; grep { $i eq $_ } split /[, ]+/, $yamlmap->{"restrict"}{'component'} } @list;
+ # extra depends / conflicts only from api 1 on
+ @list = grep { !$_->{'extra_depends'} and !$_->{'extra_conflicts'} } @list if $api < 1 ;
# first adjust ownprintformat, then set printformat accordingly
$printformat ||= $yamlmap->{"format"}{$ownprintformat};
'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel',
'calprio' => 'CalculatedPri', 'state_days' => 'State-Days',
'successtime' => 'Success-build-time',
- 'anytime' => 'Build-time'
+ 'anytime' => 'Build-time',
+ 'extra_depends' => 'Extra-Dependencies',
+ 'extra_conflicts' => 'Extra-Conflicts',
);
foreach $name (@_) {
my $sourceprefix="source---";
my $architecture=$args->{'arch'};
my $edosoptions = "-failures -explain -quiet";
- my @packagefiles = $args->{'pkgs'};
+ my $packagefiles = $args->{'pkgs'};
my $sourcesfile = $args->{'src'};
my $packagearch="";
- foreach my $packagefile (@packagefiles) {
+ foreach my $packagefile (@$packagefiles) {
open(P,$packagefile);
while (<P>) {
next unless /^Architecture/;
}
}
- print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @packagefiles)."\n";
+ print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)."\n";
open(RESULT, '-|',
- "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @packagefiles));
+ "edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles));
my $explanation="";
my $result={};
sub call_edos_depcheck {
+ return if $simulate_edos;
my $args = shift;
my $srcs = $args->{'srcs'};
my $key;
print $SOURCES "Package: source---$key\n";
print $SOURCES "Version: $pkg->{'version'}\n";
my $t = &filterarch($srcs->{$key}{'dep'} || $srcs->{$key}{'depends'}, $arch);
+ my $tt = &filterarch($pkg->{'extra_depends'}, $arch);
+ $t = $t ? ($tt ? "$t, $tt" : $t) : $tt;
print $SOURCES "Depends: $t\n" if $t;
my $u = &filterarch($srcs->{$key}{'conf'} || $srcs->{$key}{'conflicts'}, $arch);
+ my $uu = &filterarch($pkg->{'extra_conflicts'}, $arch);
+ $u = $u ? ($uu ? "$u, $uu" : $u) : $uu;
print $SOURCES "Conflicts: $u\n" if $u;
print $SOURCES "Architecture: all\n";
print $SOURCES "\n";
my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, failed_category, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days"
. ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution AND result = 'successful') AS successtime"
. ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution ) AS anytime"
+ . ", extra_depends, extra_conflicts"
. " FROM " . table_name()
. ' WHERE package = ? AND distribution = ?';
my $pkg = $dbh->selectrow_hashref( $q,
my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, failed_category, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days"
# . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution AND result = 'successful') AS successtime"
# . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution ) AS anytime"
- . ", successtime.build_time as successtime, anytime.build_time as anytime"
+ . ", successtime.build_time as successtime, anytime.build_time as anytime, extra_depends, extra_conflicts"
. " FROM " . table_name()
. " left join ( "
. "select distinct on (package, distribution) build_time, package, distribution from ".pkg_history_table_name()." where result = 'successful' order by package, distribution, timestamp "
sub update_source_info {
my $pkg = shift;
+ $pkg->{'extra_depends'} = $extra_depends if defined $extra_depends;
+ undef $pkg->{'extra_depends'} unless $pkg->{'extra_depends'};
+ $pkg->{'extra_conflicts'} = $extra_conflicts if defined $extra_conflicts;
+ undef $pkg->{'extra_conflicts'} unless $pkg->{'extra_conflicts'};
+ print Dumper $pkg if $verbose and $simulate;
return if $simulate;
my $pkg2 = get_source_info($pkg->{'package'});
'buildpri = ?, ' .
'depends = ?, ' .
'rel = ?, ' .
+ 'extra_depends = ?, ' .
+ 'extra_conflicts = ?, ' .
'bd_problem = ? ' .
'WHERE package = ? AND distribution = ?',
undef,
$pkg->{'buildpri'},
$pkg->{'depends'},
$pkg->{'rel'},
+ $pkg->{'extra_depends'},
+ $pkg->{'extra_conflicts'},
$pkg->{'bd_problem'},
$pkg->{'package'},
$distribution) or die $dbh->errstr;
# does at least one binary exist in the database and is more recent - if so, we're probably just outdated, ignore the source package
for my $bin (@{$pkgs->{'binary'}}) {
- if ($binary->{$bin} and vercmp($pkgs->{'version'}, $binary->{$bin}) < 0) {
+ if ($binary->{$bin} and vercmp($pkgs->{'version'}, $binary->{$bin}->{'version'}) < 0) {
print "$logstr skipped because binaries (assumed to be) overwritten\n" if $verbose || $simulate;
next SRCS;
}
}
$pkg->{'package'} = $name;
}
- my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'} ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}, $pkg->{'state'}):";
+ my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'}".
+ ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : "").
+ "($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}".
+ ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : "").
+ ", $pkg->{'state'}):";
- if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < $pkg->{'binary_nmu_version'}) {
+ if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) {
$pkgs->{'status'} = 'out-of-date';
}
if (isin($pkgs->{'status'}, qw (installed related))) {
if ($pkg->{'state'} ne 'Installed') {
change_state( \$pkg, 'Installed');
delete $pkg->{'depends'};
+ delete $pkg->{'extra_depends'};
+ delete $pkg->{'extra_conflicts'};
$change++;
}
my $attrs = { 'version' => 'version', 'installed_version' => 'version', 'binary_nmu_version' => 'binnmu', 'section' => 'section', 'priority' => 'priority' };
$change++;
}
}
- if (isin($pkgs->{'status'}, qw (related))) {
+ if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") {
$pkg->{'notes'} = "related";
$change++;
}
print "$logstr package in unknown state: $pkgs->{'status'}\n";
next SRCS;
}
- next if $pkgs->{'version'} eq $pkg->{'version'};
+ next if $pkgs->{'version'} eq $pkg->{'version'} and $pkgs->{'binnmu'} >= int($pkg->{'binary_nmu_version'});
+ next if $pkgs->{'version'} eq $pkg->{'version'} and !isin( $pkg->{'state'}, qw(Installed));
+ next if isin( $pkg->{'state'}, qw(Not-For-Us Failed-Removed));
if (defined( $pkg->{'state'} ) && isin( $pkg->{'state'}, qw(Building Built Build-Attempted))) {
send_mail( $pkg->{'builder'},
$pkg->{'dep'} = $pkgs->{'depends'};
$pkg->{'conf'} = $pkgs->{'conflicts'};
delete $pkg->{'builder'};
- delete $pkg->{'binary_nmu_version'};
- delete $pkg->{'binary_nmu_changelog'};
+ delete $pkg->{'binary_nmu_version'} unless $pkgs->{'binnmu'};
+ delete $pkg->{'binary_nmu_changelog'} unless $pkgs->{'binnmu'};
log_ta( $pkg, "--merge-v3: needs-build" ) unless $simulate;
update_source_info($pkg) unless $simulate;
print "$logstr set to needs-builds\n" if $simulate || $verbose;