die "transactlog is empty\n" if ! $transactlog;
die "mailprog binary $conf::mailprog does not exist or isn't executable\n"
if !-x $conf::mailprog;
-die "no distributions defined\n" if ! %distributions;
package main;
use strict;
use FileHandle;
use File::Copy;
use DBI;
-use lib '/org/wanna-build/bin';
use lib '/org/wanna-build/lib';
#use lib 'lib';
use WannaBuild;
use Date::Parse;
use List::Util qw[max];
use Dpkg::Version qw(vercmp); # TODO: change this for running with squeeze dpkg
+use Dpkg::Deps; # TODO: same
our ($verbose, $mail_logs, $list_order, $list_state,
$curr_date, $op_mode, $user, $real_user, $distribution,
$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,
+ %distributions, %distribution_aliases
);
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
+our $api = undef; # allow buildds to specify an different api
+our $recorduser = undef;
# global vars
$ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/";
"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",
"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" },
"manual-edit" => { mode => "manual-edit" },
+ "distribution-architectures" => { mode => "distribution-architectures" },
+ "distribution-aliases" => { mode => "distribution-aliases" },
);
while( @ARGV && $ARGV[0] =~ /^-/ ) {
}
}
-$op_mode = $category ? "set-failed" : "set-building"
- if !$op_mode; # default operation
-$distribution ||= "unstable";
+my $dbh;
+
+END {
+ if (defined $dbh)
+ {
+ $dbh->disconnect or warn $dbh->errstr;
+ }
+}
+
if ($distribution eq 'any-priv') {
$privmode = 'yes';
$distribution = 'any';
$privmode = 'no';
$distribution = 'any';
}
+
+my $schema_suffix = '';
+$recorduser //= (not -t and $user =~ /^buildd_/);
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode eq 'yes')) {
+ $dbh = DBI->connect("DBI:Pg:service=wanna-build") ||
+ die "FATAL: Cannot open database: $DBI::errstr\n";
+ $schema_suffix = '_public';
+}
+else
+{
+ $dbh = DBI->connect("DBI:Pg:service=wanna-build-privileged") ||
+ die "FATAL: Cannot open database: $DBI::errstr\n";
+}
+
+# TODO: This shouldn't be needed, file a bug.
+$dbh->{pg_server_prepare} = 0;
+
+$dbh->begin_work or die $dbh->errstr;
+
+my $q = 'SELECT distribution, public, auto_dep_wait FROM distributions';
+my $rows = $dbh->selectall_hashref($q, 'distribution');
+foreach my $name (keys %$rows) {
+ $distributions{$name} = {};
+ $distributions{$name}->{'noadw'} = 1 if !($rows->{$name}->{'auto_dep_wait'});
+ $distributions{$name}->{'hidden'} = 1 if !($rows->{$name}->{'public'});
+}
+
+$q = 'SELECT alias, distribution FROM distribution_aliases';
+$rows = $dbh->selectall_hashref($q, 'alias');
+foreach my $name (keys %$rows) {
+ $distribution_aliases{$name} = $rows->{$name}->{'distribution'};
+}
+$distribution = $distribution_aliases{$distribution} if (isin($distribution, keys %distribution_aliases));
+
+$op_mode = $category ? "set-failed" : "set-building"
+ if !$op_mode; # default operation
+$distribution ||= "sid";
undef $distribution if $distribution eq 'any';
if ($distribution) {
my @dists = split(/[, ]+/, $distribution);
foreach my $dist (@dists) {
die "Bad distribution '$distribution'\n"
- if !isin($dist, keys %conf::distributions);
+ if !isin($dist, keys %distributions);
}
}
if (!isin ( $op_mode, qw(list) ) && ( !$distribution || $distribution =~ /[ ,]/)) {
if (!@ARGV && !isin( $op_mode, qw(list merge-quinn merge-partial-quinn import export
merge-packages manual-edit
- merge-sources))) {
+ merge-sources distribution-architectures
+ distribution-aliases))) {
warn "No packages given.\n";
usage();
}
}
$list_order = $yamlmap->{"list-order"}{$list_state} if !$list_order and $list_state;
$list_order ||= $yamlmap->{"list-order"}{'default'};
-
-my $dbh;
-
-END {
- if (defined $dbh)
- {
- $dbh->disconnect or warn $dbh->errstr;
- }
-}
-
-my $schema_suffix = '';
-if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/) && !($privmode eq 'yes')) {
- $dbh = DBI->connect("DBI:Pg:service=wanna-build") ||
- die "FATAL: Cannot open database: $DBI::errstr\n";
- $schema_suffix = '_public';
-}
-else
-{
- $dbh = DBI->connect("DBI:Pg:service=wanna-build-privileged") ||
- die "FATAL: Cannot open database: $DBI::errstr\n";
-}
-
-# TODO: This shouldn't be needed, file a bug.
-$dbh->{pg_server_prepare} = 0;
-
-$dbh->begin_work or die $dbh->errstr;
+$api //= $yamlmap->{"api"};
+$api //= 0;
process();
export_db( $export_to );
last SWITCH;
};
+ /^distribution-architectures/ && do {
+ show_distribution_architectures();
+ last SWITCH;
+ };
+ /^distribution-aliases/ && do {
+ show_distribution_aliases();
+ last SWITCH;
+ };
die "Unexpected operation mode $op_mode\n";
}
- if (not -t and $user =~ /-/) {
+ if ($recorduser) {
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 );
+ }
}
}
}
print "$name: $ok\n" if $verbose;
} else {
- print "- $name:\n";
- print " - status: ok\n";
- if ($pkg->{'binary_nmu_version'}) {
- print " - binNMU:\n";
- print " - version: $pkg->{'binary_nmu_version'}\n";
- print " - changelog: $pkg->{'binary_nmu_changelog'}\n";
- }
+ print "- $name:\n";
+ print " - status: ok\n";
+ printf " - pkg-ver: %s_%s\n", $name, $version;
+ print " - binNMU: $pkg->{'binary_nmu_version'}\n" if $pkg->{'binary_nmu_version'};
+ print " - extra-changelog: $pkg->{'binary_nmu_changelog'}\n" if $pkg->{'binary_nmu_changelog'} && $pkg->{'binary_nmu_version'};
+ print " - extra-depends: $pkg->{'extra_depends'}\n" if $pkg->{'extra_depends'};
+ print " - extra-conflicts: $pkg->{'extra_conflicts'}\n" if $pkg->{'extra_conflicts'};
}
change_state( \$pkg, 'Building' );
$pkg->{'package'} = $name;
$pkg->{'notes'} = 'out-of-date';
$pkg->{'buildpri'} = $pkg->{'permbuildpri'}
if (defined $pkg->{'permbuildpri'});
+ if (defined $distributions{$distribution}{noadw}) {
+ change_state( \$pkg, 'Installed' );
+ } else {
+ change_state( \$pkg, 'BD-Uninstallable' );
+ }
}
log_ta( $pkg, "--binNMU" );
update_source_info($pkg);
return;
}
- if ($distribution eq "unstable") {
+ if (!defined $distributions{$distribution}{noadw}) {
change_state( \$pkg, 'BD-Uninstallable' );
$pkg->{'bd_problem'} = "Installability of build dependencies not tested yet";
}
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;
my $scale = $priomap->{'waitingdays'}->{'scale'} || 1;
$pkg->{'calprio'} += $days * $scale;
+ my $btime = max($pkg->{'anytime'}, $pkg->{'successtime'});
+ my $bhours = defined($btime) ? int($btime/3600) : ($priomap->{'buildhours'}->{'default'} || 2);
+ $bhours = $priomap->{'buildhours'}->{'min'} if $priomap->{'buildhours'}->{'min'} and $bhours < $priomap->{'buildhours'}->{'min'};
+ $bhours = $priomap->{'buildhours'}->{'max'} if $priomap->{'buildhours'}->{'max'} and $bhours > $priomap->{'buildhours'}->{'max'};
+ $scale = $priomap->{'buildhours'}->{'scale'} || 1;
+ $pkg->{'calprio'} -= $bhours * $scale;
+
$pkg->{'calprio'} += $pkg->{'permbuildpri'} if $pkg->{'permbuildpri'};
$pkg->{'calprio'} += $pkg->{'buildpri'} if $pkg->{'buildpri'};
# 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};
my( $name, $pkg, $key, $dist );
my @firstkeys = qw(package version builder state section priority
installed_version previous_state state_change);
- my @dists = $info_all_dists ? keys %conf::distributions : ($distribution);
+ my @dists = $info_all_dists ? keys %distributions : ($distribution);
my %beautykeys = ( 'package' => 'Package', 'version' => 'Version', 'builder' => 'Builder',
'state' => 'State', 'section' => 'Section', 'priority' => 'Priority',
'installed_version' => 'Installed-Version', 'previous_state' => 'Previous-State',
'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 (@_) {
}
-sub greparch {
- my ($gapkglong, $gaarch) = @_;
- my ($gapkg, $gaarchs) = split(/ \[/, $gapkglong);
- if ($gaarchs) {
- $_ = $gapkg;
- chop($gaarchs); # take away the ]
- my @gaarches = split(/ /, $gaarchs);
- if (substr($gaarches[0], 0, 1) eq '!') {
- return 0 if grep /^!$gaarch$/, @gaarches;
- } else { # positive case
- return 0 unless grep /^$gaarch$/, @gaarches;
- }
- };
- return 1;
-}
sub filterarch {
- my $faarch = $_[1];
- return join(', ', grep { &greparch($_, $faarch) } split(/, ?/, $_[0]));
+ return "" unless $_[0];
+ return Dpkg::Deps::parse($_[0], ("reduce_arch" => 1, "host_arch" => $_[1]))->dump();
}
sub wb_edos_builddebcheck {
my $srcs = $args->{'srcs'};
my $key;
- return if defined ($conf::distributions{$distribution}{noadw}) && not defined $args->{'depwait'};
+ return if defined ($distributions{$distribution}{noadw}) && not defined $args->{'depwait'};
# We need to check all of needs-build, as any new upload could make
# something in needs-build have uninstallable deps
my $db = get_all_source_info();
foreach $key (keys %$db) {
my $pkg = $db->{$key};
- if (defined $pkg and isin($pkg->{'state'}, qw/Needs-Build BD-Uninstallable/) and not defined ($conf::distributions{$distribution}{noadw})) {
+ if (defined $pkg and isin($pkg->{'state'}, qw/Needs-Build BD-Uninstallable/) and not defined ($distributions{$distribution}{noadw})) {
$interesting_packages{$key} = undef;
}
if (defined $pkg and isin($pkg->{'state'}, qw/Dep-Wait/) and defined $args->{'depwait'}) {
$interesting_packages_depwait{$key} = undef;
# we always check for BD-Uninstallability in depwait - could be that depwait is satisfied but package is uninstallable
- $interesting_packages{$key} = undef unless defined ($conf::distributions{$distribution}{noadw});
+ $interesting_packages{$key} = undef unless defined ($distributions{$distribution}{noadw});
}
}
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 "
return $db;
}
+sub show_distribution_architectures {
+ my $q = 'SELECT distribution, spacecat_all(architecture) AS architectures '.
+ 'FROM distribution_architectures '.
+ 'GROUP BY distribution';
+ my $rows = $dbh->selectall_hashref($q, 'distribution');
+ foreach my $name (keys %$rows) {
+ print $name.': '.$rows->{$name}->{'architectures'}."\n";
+ }
+}
+
+sub show_distribution_aliases {
+ foreach my $alias (keys %distribution_aliases) {
+ print $alias.': '.$distribution_aliases{$alias}."\n";
+ }
+}
+
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;
($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : "").
", $pkg->{'state'}):";
- if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) {
+ if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && $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' };
$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;
projects / wannabuild.git / blobdiff