# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
+use strict;
+use warnings;
+use 5.010;
package conf;
+
+use vars qw< $basedir $dbbase $transactlog $mailprog $buildd_domain >;
# defaults
$basedir ||= "/var/lib/debbuild";
$dbbase ||= "build-db";
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 POSIX;
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 YAML::Tiny;
use Data::Dumper;
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 $api = 0; # allow buildds to specify an different api
+our $simulate_edos = 0;
+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",
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,
die "Unknown state to list: $list_state\n"
if !isin( $list_state, qw(needs-build building uploaded
built build-attempted failed installed dep-wait
- not-for-us all failed-removed
+ not-for-us auto-not-for-us all failed-removed
install-wait reupload-wait bd-uninstallable));} },
# options with args
dist =>
{ short => "O", arg => \$list_order,
code => sub {
die "Bad ordering character\n"
- if $list_order !~ /^[PSpsncbCW]+$/;
+ if $list_order !~ /^[PSpsncbCWT]+$/;
} },
message => { short => "m", arg => \$fail_reason },
# database is deprecated, use arch instead.
"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;
+ }
+}
+
+$distribution ||= "sid";
if ($distribution eq 'any-priv') {
- $privmode = 'yes';
+ $privmode = 1;
$distribution = 'any';
}
if ($distribution eq 'any-unpriv') {
- $privmode = 'no';
+ $privmode = 0;
$distribution = 'any';
}
+
+my $schema_suffix = '';
+$recorduser //= (not -t and $user =~ /^buildd_/);
+if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode)) {
+ $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, build_dep_resolver, suppress_successful_logs, archive 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'});
+ $distributions{$name}->{'build_dep_resolver'} = $rows->{$name}->{'build_dep_resolver'} if $rows->{$name}->{'build_dep_resolver'};
+ $distributions{$name}->{'suppress_successful_logs'} = $rows->{$name}->{'suppress_successful_logs'} if $rows->{$name}->{'suppress_successful_logs'};
+ $distributions{$name}->{'archive'} = $rows->{$name}->{'archive'} if $rows->{$name}->{'archive'};
+}
+
+$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
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();
}
my $yamldir = "/org/wanna-build/etc/yaml";
my @files = ('wanna-build.yaml');
if ((getpwuid($>))[7]) { push (@files, ((getpwuid($>))[7])."/.wanna-build.yaml"); }
-if ($user =~ /(buildd.*)-/) { push (@files, "$1.yaml") };
+if ($user && $user =~ /(buildd.*)-/) { push (@files, "$1.yaml") };
if ($user) { push ( @files, "$user.yaml"); }
foreach my $file (@files) {
my $cfile = File::Spec->rel2abs( $file, $yamldir );
}
$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();
@ARGV = ( $ARGS[0] );
my $pkgs = parse_packages(0);
@ARGV = ( $ARGS[3] );
- my $pkgs = parse_packages(1);
+ $pkgs = parse_packages(1);
@ARGV = ( $ARGS[1] );
parse_quinn_diff(0);
@ARGV = ( $ARGS[2] );
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'};
+ print " - archive: $distributions{$distribution}->{'archive'}\n" if $distributions{$distribution}->{'archive'};
+ print " - build_dep_resolver: $distributions{$distribution}->{'build_dep_resolver'}\n" if $distributions{$distribution}->{'build_dep_resolver'};
+ print " - arch_all: $pkg->{'build_arch_all'}\n" if $pkg->{'build_arch_all'};
+ print " - suppress_successful_logs: $distributions{$distribution}->{'suppress_successful_logs'}\n" if $distributions{$distribution}->{'suppress_successful_logs'};
}
change_state( \$pkg, 'Building' );
$pkg->{'package'} = $name;
"Skipping.\n";
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";
} else {
$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;
sub sort_list_func {
my $map_funcs = {
- 'C' => ['<=>', sub { return (-1) * $_[0]->{'calprio'}; }],
- 'W' => ['<=>', sub { return (-1) * $_[0]->{'state_days'}; }],
- 'P' => ['<=>', sub { return (-1) * $_[0]->{'buildpri'}; }],
+ 'C' => ['<->', sub { return $_[0]->{'calprio'}; }],
+ 'W' => ['<->', sub { return $_[0]->{'state_days'}; }],
+ 'P' => ['<->', sub { return $_[0]->{'buildpri'}; }],
'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}}; }],
's' => ['<=>', sub { return $sectval{$_[0]->{'section'}}; }],
'n' => ['cmp', sub { return $_[0]->{'package'}; }],
'c' => ['<=>', sub { return ($_[0]->{'notes'} =~ /^(out-of-date|partial)/) ? 0: ($_[0]->{'notes'} =~ /^uncompiled/) ? 2 : 1; }],
'f' => ['<=>', sub { return $catval{ $_[0]->{'failed_category'} ? $_[0]->{'failed_category'}: "none" }; }],
'S' => ['<=>', sub { return $prioval{$_[0]->{'priority'}} > $prioval{'standard'}; }],
+ 'T' => ['<->', sub { return $_[0]->{'state_time'} % 86400;} ], # Fractions of a day
};
foreach my $letter (split( //, $list_order )) {
my $r;
+ $r = &{$map_funcs->{$letter}[1]}($b) <=> &{$map_funcs->{$letter}[1]}($a) if $map_funcs->{$letter}[0] eq '<->';
$r = &{$map_funcs->{$letter}[1]}($a) <=> &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq '<=>';
$r = &{$map_funcs->{$letter}[1]}($a) cmp &{$map_funcs->{$letter}[1]}($b) if $map_funcs->{$letter}[0] eq 'cmp';
return $r if $r != 0;
my $scale = $priomap->{'waitingdays'}->{'scale'} || 1;
$pkg->{'calprio'} += $days * $scale;
+ my $btime = max($pkg->{'anytime'}//0, $pkg->{'successtime'}//0);
+ my $bhours = $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'};
my $printfmt = shift;
my $pkg = shift;
my $var = shift;
+
=pod
+
Within an format string, the following values are allowed (need to be preceded by %).
This can be combined to e.g.
wanna-build --format='wanna-build -A %a --give-back %p_%v' -A mipsel --list=failed
Text could contain further %. To start with !, use %!
=cut
+
return stringf($printfmt, (
'p' => make_fmt( $pkg->{'package'}, $pkg, $var),
'a' => make_fmt( $arch, $pkg, $var),
'u' => make_fmt( $pkg->{'builder'}, $pkg, $var),
'X' => make_fmt( sub {
my $c = "$pkg->{'priority'}:$pkg->{'notes'}";
- $c .= ":PREV-FAILED" if $pkg->{'previous_state'} =~ /^Failed/;
+ $c .= ":PREV-FAILED" if $pkg->{'previous_state'} && $pkg->{'previous_state'} =~ /^Failed/;
$c .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'};
$c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'};
$c .= ":calprio{". $pkg->{'calprio'}."}";
'O' => make_fmt( sub { return seconds2time ( $pkg->{'successtime'}); }, $pkg, $var),
'q' => make_fmt( $pkg->{'anytime'}, $pkg, $var),
'Q' => make_fmt( sub { return seconds2time ( $pkg->{'anytime'}); }, $pkg, $var),
- 'r' => make_fmt( sub { return max($pkg->{'successtime'}, $pkg->{'anytime'}); }, $pkg, $var),
- 'R' => make_fmt( sub { return seconds2time ( max($pkg->{'successtime'}, $pkg->{'anytime'})); }, $pkg, $var),
+ 'r' => make_fmt( sub { my $c = max($pkg->{'successtime'}//0, $pkg->{'anytime'}//0); return $c if $c; return; }, $pkg, $var),
+ 'R' => make_fmt( sub { return seconds2time ( max($pkg->{'successtime'}//0, $pkg->{'anytime'}//0)); }, $pkg, $var),
));
}
# 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};
+ $printformat ||= $yamlmap->{"format"}{$ownprintformat} if $ownprintformat;
$printformat ||= $yamlmap->{"format"}{"default"}{$state};
$printformat ||= $yamlmap->{"format"}{"default"}{"default"};
- undef $printformat if ($ownprintformat eq 'none');
+ undef $printformat if ($ownprintformat && $ownprintformat eq 'none');
foreach $pkg (sort sort_list_func @list) {
if ($printformat) {
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',
'failed_category' => 'Failed-Category', 'notes' => 'Notes',
'distribution' => 'Distribution', 'old_failed' => 'Old-Failed',
'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel',
- 'calprio' => 'CalculatedPri', 'state_days' => 'State-Days',
+ 'calprio' => 'CalculatedPri', 'state_days' => 'State-Days', 'state_time' => 'State-Time',
'successtime' => 'Success-build-time',
- 'anytime' => 'Build-time'
+ 'anytime' => 'Build-time',
+ 'extra_depends' => 'Extra-Dependencies',
+ 'extra_conflicts' => 'Extra-Conflicts',
+ 'build_arch_all' => 'Build-Arch-All',
);
foreach $name (@_) {
my $file = shift;
print "Reading ASCII database from $file..." if $verbose >= 1;
- open( F, "<$file" ) or
+ open( my $fh, '<', $file ) or
die "Can't open database $file: $!\n";
local($/) = ""; # read in paragraph mode
- while( <F> ) {
+ while( <$fh> ) {
my( %thispkg, $name );
s/[\s\n]+$//;
s/\n[ \t]+/\376\377/g; # fix continuation lines
or die $dbh->errstr;
}
}
- close( F );
+ close( $fh );
print "done\n" if $verbose >= 1;
}
die "Bad state $pkg->{'state'} of package $pkg->{Package}\n"
if !isin( $pkg->{'state'},
qw(Needs-Build Building Built Build-Attempted Uploaded Installed Dep-Wait Dep-Wait-Removed
- Failed Failed-Removed Not-For-Us BD-Uninstallable
+ Failed Failed-Removed Not-For-Us BD-Uninstallable Auto-Not-For-Us
) );
}
my($name,$pkg,$key);
print "Writing ASCII database to $file..." if $verbose >= 1;
- open( F, ">$file" ) or
+ open( my $fh, '>', $file ) or
die "Can't open export $file: $!\n";
my $db = get_all_source_info();
$val =~ s/\n*$//;
$val =~ s/^/ /mg;
$val =~ s/^ +$/ ./mg;
- print F "$key: $val\n";
+ print $fh "$key: $val\n";
}
- print F "\n";
+ print $fh "\n";
}
- close( F );
+ close( $fh );
print "done\n" if $verbose >= 1;
}
if (defined($$state) and $$state eq 'Failed') {
$pkg->{'old_failed'} =
"-"x20 . " $pkg->{'version'} " . "-"x20 . "\n" .
- $pkg->{'failed'} . "\n" .
- $pkg->{'old_failed'};
+ ($pkg->{'failed'} // ""). "\n" .
+ ($pkg->{'old_failed'} // "");
delete $pkg->{'failed'};
delete $pkg->{'failed_category'};
}
$to .= '@' . $domain if $to !~ /\@/;
$text =~ s/^\.$/../mg;
local $SIG{'PIPE'} = 'IGNORE';
- open( PIPE, "| $conf::mailprog -oem $to" )
+ open( my $pipe, '|-', "$conf::mailprog -oem $to" )
or die "Can't open pipe to $conf::mailprog: $!\n";
chomp $text;
- print PIPE "From: $from\n";
- print PIPE "Subject: $subject\n\n";
- print PIPE "$text\n";
- close( PIPE );
+ print $pipe "From: $from\n";
+ print $pipe "Subject: $subject\n\n";
+ print $pipe "$text\n";
+ close( $pipe );
}
# for parsing input to dep-wait
}
-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 $packagearch="";
foreach my $packagefile (@$packagefiles) {
- open(P,$packagefile);
- while (<P>) {
+ open(my $fh,'<', $packagefile);
+ while (<$fh>) {
next unless /^Architecture/;
next if /^Architecture:\s*all/;
/Architecture:\s*([^\s]*)/;
return "Package file contains different architectures: $packagearch, $1";
}
}
- close P;
+ close $fh;
}
if ( $architecture eq "" ) {
}
print "calling: edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles)."\n";
- open(RESULT, '-|',
+ open(my $result_cmd, '-|',
"edos-debcheck $edosoptions < $sourcesfile ".join('', map {" '-base FILE' ".$_ } @$packagefiles));
my $explanation="";
my $result={};
my $binpkg="";
- while (<RESULT>) {
+ while (<$result_cmd>) {
# source---pulseaudio (= 0.9.15-4.1~bpo50+1): FAILED
# source---pulseaudio (= 0.9.15-4.1~bpo50+1) depends on missing:
# - libltdl-dev (>= 2.2.6a-2)
}
}
- close RESULT;
+ close $result_cmd;
$result->{$binpkg} = $explanation if $binpkg;
return $result;
sub call_edos_depcheck {
+ return if $simulate_edos;
my $args = shift;
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";
sub get_readonly_source_info {
my $name = shift;
# SELECT FLOOR(EXTRACT('epoch' FROM age(localtimestamp, '2010-01-22 23:45')) / 86400) -- change to that?
- 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"
+ 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, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
. ", (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, build_arch_all"
. " FROM " . table_name()
. ' WHERE package = ? AND distribution = ?';
my $pkg = $dbh->selectrow_hashref( $q,
sub get_source_info {
my $name = shift;
return get_readonly_source_info($name) if $simulate;
- my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change)) as state_days FROM ' .
+ my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change)) as state_days, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time FROM ' .
table_name() . ' WHERE package = ? AND distribution = ?' .
' FOR UPDATE',
undef, $name, $distribution);
sub get_all_source_info {
my %options = @_;
- 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"
+ 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, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time"
# . ", (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 "
push @args, "FAILED";
}
- if ($options{list_min_age} > 0) {
+ if ($options{list_min_age} && $options{list_min_age} > 0) {
$q .= ' AND age(state_change) > ? ';
push @args, $options{list_min_age} . " days";
}
- if ($options{list_min_age} < 0) {
+ if ($options{list_min_age} && $options{list_min_age} < 0) {
$q .= ' AND age(state_change) < ? ';
push @args, -$options{list_min_age} . " days";
}
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;
or die $dbh->errstr;
}
-sub lock_table()
-{
+sub lock_table {
return if $simulate;
$dbh->do('LOCK TABLE ' . table_name() .
' IN EXCLUSIVE MODE', undef) or die $dbh->errstr;
}
-sub parse_argv() {
+sub parse_argv {
# parts the array $_[0] and $_[1] and returns the sub-array (modifies the original one)
my @ret = ();
my $args = shift;
return @ret;
}
-sub parse_all_v3() {
+sub parse_all_v3 {
my $srcs = shift;
my $vars = shift;
my $db = get_all_source_info();
foreach my $name (keys %$srcs) {
next if $name eq '_binary';
- # state = installed, out-of-date, uncompiled, not-for-us
+ # state = installed, out-of-date, uncompiled, not-for-us, auto-not-for-us
my $pkgs = $srcs->{$name};
my $pkg = $db->{$name};
unless ($pkg) {
next SRCS if $pkgs->{'status'} eq 'not-for-us';
- my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'} ($vars->{'arch'}, $vars->{'suite'}):";
+ my $logstr = sprintf("merge-v3 %s %s_%s (%s, %s):", $vars->{'time'}, $name, $pkgs->{'version'}, $vars->{'arch'}, $vars->{'suite'});
# 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'}}) {
}
$pkg->{'package'} = $name;
}
- my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'} ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}, $pkg->{'state'}):";
+ my $logstr = sprintf("merge-v3 %s %s_%s", $vars->{'time'}, $name, $pkgs->{'version'}).
+ ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : "").
+ sprintf(" (%s, %s, previous: %s", $vars->{'arch'}, $vars->{'suite'}, $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)) && $pkgs->{'version'} eq $pkg->{'version'} && $pkgs->{'binnmu'} && $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' };
foreach my $k (keys %$attrs) {
- if ($pkg->{$k} ne $pkgs->{$attrs->{$k}}) {
+ if (!$pkg->{$k} or !$pkgs->{$attrs->{$k}} or $pkg->{$k} ne $pkgs->{$attrs->{$k}}) {
$pkg->{$k} = $pkgs->{$attrs->{$k}};
$change++;
}
$change++;
}
if ($change) {
- print "$logstr set to installed/".$pkg->{'notes'}."\n" if $verbose || $simulate;
+ print "$logstr set to installed/".($pkg->{'notes'}//"")."\n" if $verbose || $simulate;
log_ta( $pkg, "--merge-v3: installed" ) unless $simulate;
update_source_info($pkg) unless $simulate;
}
next;
}
+ if ($pkgs->{'status'} eq 'auto-not-for-us') {
+ next if isin( $pkg->{'state'}, qw(Not-For-Us Failed Failed-Removed Dep-Wait Dep-Wait-Removed Auto-Not-For-Us));
+ # if the package is currently current, the status is Installed, not not-for-us
+
+ change_state( \$pkg, "Auto-Not-For-Us" );
+ log_ta( $pkg, "--merge-v3: Auto-Not-For-Us" ) unless $simulate;
+ update_source_info($pkg) unless $simulate;
+ print "$logstr set to auto-not-for-us\n" if $verbose || $simulate;
+ next SRCS;
+ }
+
# only uncompiled / out-of-date are left, so check if anything new
if (!(isin($pkgs->{'status'}, qw (uncompiled out-of-date)))) {
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'} 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))) {
$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;