X-Git-Url: https://git.donarmstrong.com/?p=wannabuild.git;a=blobdiff_plain;f=bin%2Fwanna-build;h=27fb2126d65e8eaaa78312b8819fe5b109ec4636;hp=3775de80eacc53b61adf4ff1808f66e5f250312a;hb=185e4f130080855a0d8728a8d28f0c7720742620;hpb=30cbae16042fc0bc6bf34fcc7d5bc34079b08ceb diff --git a/bin/wanna-build b/bin/wanna-build index 3775de8..27fb212 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -19,8 +19,12 @@ # 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; package conf; + +use vars qw< $basedir $dbbase $transactlog $mailprog $buildd_domain >; # defaults $basedir ||= "/var/lib/debbuild"; $dbbase ||= "build-db"; @@ -32,16 +36,14 @@ die "dbbase is empty\n" if ! $dbbase; 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; @@ -50,6 +52,7 @@ use String::Format; 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, @@ -59,11 +62,14 @@ our ($verbose, $mail_logs, $list_order, $list_state, $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/"; @@ -82,9 +88,6 @@ my %prognames = ( "uploaded-build" => "set-uploaded", "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", @@ -110,6 +113,8 @@ elsif ($progname =~ /^list-(.*)$/) { 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; @@ -133,13 +138,14 @@ my %options = "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, @@ -157,7 +163,7 @@ my %options = 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 => @@ -178,7 +184,7 @@ my %options = { 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. @@ -206,10 +212,14 @@ my %options = "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] =~ /^-/ ) { @@ -253,9 +263,15 @@ 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'; @@ -264,12 +280,52 @@ if ($distribution eq 'any-unpriv') { $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, 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 +$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 =~ /[ ,]/)) { @@ -294,7 +350,8 @@ if ($verbose) { 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(); } @@ -353,32 +410,8 @@ if (not $yamlmap) { } $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(); @@ -487,7 +520,7 @@ sub 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] ); @@ -539,10 +572,18 @@ sub 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) { @@ -605,6 +646,9 @@ sub add_packages { elsif ($op_mode eq "set-binary-nmu") { set_one_binnmu( $name, $version ); } + elsif ($op_mode eq "set-update") { + set_one_update( $name, $version ); + } } } @@ -740,13 +784,17 @@ sub add_one_building { } 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; @@ -1083,7 +1131,7 @@ sub add_one_needsbuild { "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 { @@ -1131,6 +1179,11 @@ sub set_one_binnmu { $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); @@ -1152,7 +1205,7 @@ sub set_one_binnmu { 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"; } @@ -1281,6 +1334,21 @@ sub add_one_depwait { 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; @@ -1843,9 +1911,9 @@ BEGIN { 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'}; }], @@ -1853,10 +1921,12 @@ sub sort_list_func { '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; @@ -1881,6 +1951,13 @@ sub calculate_prio { 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'}; @@ -1933,7 +2010,9 @@ sub print_format { 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 @@ -1967,6 +2046,7 @@ X the string normally between [], e.g. optional:out-of-date:calprio{61}:days{25} 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), @@ -2025,6 +2105,8 @@ sub list_packages { # 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}; @@ -2083,7 +2165,7 @@ sub info_packages { 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', @@ -2094,9 +2176,12 @@ sub info_packages { '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 (@_) { @@ -2240,7 +2325,7 @@ sub check_entry { 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 ) ); } @@ -2402,24 +2487,9 @@ sub build_deplist { } -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 { @@ -2511,11 +2581,12 @@ sub wb_edos_builddebcheck { 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 @@ -2525,13 +2596,13 @@ sub call_edos_depcheck { 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}); } } @@ -2550,8 +2621,12 @@ sub call_edos_depcheck { 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"; @@ -2728,9 +2803,10 @@ sub pkg_history_table_name { 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, @@ -2741,7 +2817,7 @@ sub get_readonly_source_info { 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); @@ -2751,10 +2827,10 @@ sub get_source_info { 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 " @@ -2802,8 +2878,29 @@ sub get_all_source_info { 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'}); @@ -2831,6 +2928,8 @@ sub update_source_info { 'buildpri = ?, ' . 'depends = ?, ' . 'rel = ?, ' . + 'extra_depends = ?, ' . + 'extra_conflicts = ?, ' . 'bd_problem = ? ' . 'WHERE package = ? AND distribution = ?', undef, @@ -2851,6 +2950,8 @@ sub update_source_info { $pkg->{'buildpri'}, $pkg->{'depends'}, $pkg->{'rel'}, + $pkg->{'extra_depends'}, + $pkg->{'extra_conflicts'}, $pkg->{'bd_problem'}, $pkg->{'package'}, $distribution) or die $dbh->errstr; @@ -2901,14 +3002,13 @@ sub add_user_info { 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; @@ -2920,7 +3020,7 @@ sub parse_argv() { return @ret; } -sub parse_all_v3() { +sub parse_all_v3 { my $srcs = shift; my $vars = shift; my $db = get_all_source_info(); @@ -2930,13 +3030,13 @@ sub parse_all_v3() { 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'}}) { @@ -2947,9 +3047,13 @@ sub parse_all_v3() { } $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)) && $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))) { @@ -2957,6 +3061,8 @@ sub parse_all_v3() { 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' }; @@ -2966,7 +3072,7 @@ sub parse_all_v3() { $change++; } } - if (isin($pkgs->{'status'}, qw (related))) { + if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") { $pkg->{'notes'} = "related"; $change++; } @@ -2993,12 +3099,24 @@ sub parse_all_v3() { 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'} >= 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))) { @@ -3021,8 +3139,8 @@ sub parse_all_v3() { $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;