X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=a6975dd871223ee6d39c5ac7dd2a5848e405dff0;hb=b0d2541fcb7e8d11dd9d79a882f715d5c212164d;hp=f5717c4d8e6cdedec5e6e25a7e1bf02af759ed34;hpb=44084552c8edb7c7fa088d0f1023b4bc4e8106fe;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index f5717c4..a6975dd 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -43,6 +43,7 @@ use POSIX; use FileHandle; use File::Copy; use DBI; +use Getopt::Long qw ( :config gnu_getopt ); use lib '/org/wanna-build/lib'; #use lib 'lib'; use WannaBuild; @@ -63,14 +64,13 @@ use Dpkg::Deps; # TODO: same our ($verbose, $mail_logs, $list_order, $list_state, $curr_date, $op_mode, $user, $real_user, $distribution, - $fail_reason, $opt_override, $import_from, $export_to, $opt_create_db, + $fail_reason, $opt_override, $import_from, $export_to, %prioval, %sectval, $info_all_dists, $arch, - $category, %catval, %short_category, - $short_date, $list_min_age, $dbbase, @curr_time, + $short_date, $list_min_age, $list_max_age, $dbbase, @curr_time, $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc, $printformat, $ownprintformat, $privmode, $extra_depends, $extra_conflicts, - %distributions, %distribution_aliases + %distributions, %distribution_aliases, $actions ); our $Pas = '/org/buildd.debian.org/etc/packages-arch-specific/Packages-arch-specific'; our $simulate = 0; @@ -88,161 +88,108 @@ $curr_date = strftime("%Y %b %d %H:%M:%S",@curr_time); $short_date = strftime("%m/%d/%y",@curr_time); $| = 1; -%short_category = ( u => "uploaded-fixed-pkg", - f => "fix-expected", - r => "reminder-sent", - n => "nmu-offered", - e => "easy", - m => "medium", - h => "hard", - c => "compiler-error", - "" => "none" ); - -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; - die "$api too large" unless $api <= 1; - } }, - verbose => { short => "v", flag => \$verbose }, - override => { short => "o", flag => \$opt_override }, - "create-db" => { flag => \$opt_create_db }, - "correct-compare" => { flag => \$WannaBuild::opt_correct_version_cmp }, - # TODO: remove after buildds no longer pass to wanna-build - "no-propagation" => { short => "N" }, - "no-down-propagation" => { short => "D" }, - # normal actions - take => { mode => "set-building" }, - failed => { short => "f", mode => "set-failed" }, - uploaded => { short => "u", mode => "set-uploaded" }, - "no-build" => { short => "n", mode => "set-not-for-us" }, - built => { mode => "set-built" }, - attempted => { mode => "set-attempted" }, - "give-back" => { mode => "set-needs-build" }, - "dep-wait" => { mode => "set-dep-wait" }, - forget => { mode => "forget" }, - 'forget-user' => { mode => 'forget-user' }, - update => { mode => "set-update" }, - "merge-v3" => { mode => "merge-v3" }, - info => { short => "i", mode => "info" }, - 'binNMU' => { mode => 'set-binary-nmu', arg => \$binNMUver, - code => sub { die "Invalid binNMU version: $binNMUver\n" - if $binNMUver !~ /^([\d]*)$/ and $1 >= 0; } }, - 'perm-build-priority' => { mode => "set-permanent-build-priority", arg => \$build_priority, - code => sub { die "Invalid build priority: $build_priority\n" - if $build_priority !~ /^-?[\d]+$/; } }, - 'build-priority' => { mode => "set-build-priority", arg => \$build_priority, - code => sub { die "Invalid build priority: $build_priority\n" - if $build_priority !~ /^-?[\d]+$/; } }, - list => - { short => "l", mode => "list", arg => \$list_state, - code => sub { - 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 auto-not-for-us all failed-removed - install-wait reupload-wait bd-uninstallable));} }, - # options with args - dist => - { short => "d", arg => \$distribution, - code => sub { - if ($distribution eq "a" || $distribution eq "all") { - $info_all_dists = 1; - $distribution = ""; - } - else { - $distribution = "oldstable" if $distribution eq "o"; - $distribution = "stable" if $distribution eq "s"; - $distribution = "testing" if $distribution eq "t"; - $distribution = "unstable" if $distribution eq "u"; - } - } }, - order => - { short => "O", arg => \$list_order, - code => sub { - die "Bad ordering character\n" - if $list_order !~ /^[PSpsncbCWT]+$/; - } }, - message => { short => "m", arg => \$fail_reason }, - # database is deprecated, use arch instead. - database => { short => "b", arg => \$conf::dbbase }, - arch => { short => "A", arg => \$arch }, - user => { short => "U", arg => \$user }, - category => { short => "c", arg => \$category, - code => sub { - $category = $short_category{$category} - if exists $short_category{$category}; - die "Unknown category: $category\n" - if !isin( $category, values %short_category ); - } }, - "min-age" => { short => "a", arg => \$list_min_age, - code => sub { - die "Argument of --min-age must be a non-zero number\n" - if $list_min_age == 0; - } }, - "max-age" => { arg => \$list_min_age, - code => sub { - die "Argument of --max-age must be a non-zero number\n" - if $list_min_age == 0; - $list_min_age *= -1; - } }, - "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] =~ /^-/ ) { - $_ = shift @ARGV; - last if $_ eq "--"; - my($opt, $optname, $arg); - if (/^--([^=]+)(=|$)/) { - $optname = $1; - $opt = $options{$optname}; - $arg = $1 if /^--\Q$optname\E=((.|\n)*)$/; - } - else { - $optname = substr( $_, 1, 1 ); - $opt = (grep { defined($_->{short}) ? $_->{short} eq $optname : 0} values %options)[0]; - $arg = $1 if /^-$optname(.+)$/; - } - if (!$opt) { - warn "Unknown option: --$1\n"; - usage(); - } - if ($opt->{arg}) { - if (!defined $arg) { - die "$optname option missing argument\n" if !@ARGV; - $arg = shift @ARGV; - } - ${$opt->{arg}} = $arg; - } - elsif (defined $arg) { - die "Option $optname takes no argument\n"; - } - - if ($opt->{mode}) { - die "Conflicting operation modes\n" if $op_mode; - $op_mode = $opt->{mode}; - } - if ($opt->{flag}) { - ${$opt->{flag}}++; - } - if ($opt->{code}) { - &{$opt->{code}}; - } -} +# set mode of operation based on command line switch. Should be used +# by GetOptions below. +sub _set_mode_set { $op_mode = "set-$_[0]" } +sub _set_mode { $op_mode = "$_[0]" } + +sub _option_deprecated { warn "Option $_[0] is deprecated" } + +GetOptions( + # this is not supported by all operations (yet)! + 'simulate' => \$simulate, + 'simulate-edos' => \$simulate_edos, + 'simulate-all' => sub { $simulate = 1; $simulate_edos = 1; }, + 'api=i' => sub { + $api = $_[1]; + die "$api too large" unless $api <= 1; + }, + 'verbose|v' => \$verbose, + 'override|o' => \$opt_override, + 'correct-compare' => \$WannaBuild::opt_correct_version_cmp, + + # TODO: remove after buildds no longer pass to wanna-build + 'no-propagation|N' => \&_option_deprecated, + 'no-down-propagation|D' => \&_option_deprecated, + + # normal actions + 'building|take' => \&_set_mode_set, + 'failed|f' => \&_set_mode_set, + 'uploaded|u' => \&_set_mode_set, + 'not-for-us|no-build|n' => \&_set_mode_set, + 'built' => \&_set_mode_set, + 'attempted' => \&_set_mode_set, + 'needs-build|give-back' => \&_set_mode_set, + 'dep-wait' => \&_set_mode_set, + 'update' => \&_set_mode_set, + 'forget' => \&_set_mode, + 'forget-user' => \&_set_mode, + 'merge-v3' => \&_set_mode, + 'info|i' => \&_set_mode, + 'binary-nmu|binNMU=i' => sub { + _set_mode_set(@_); + $binNMUver = $_[1]; + }, + 'permanent-build-priority|perm-build-priority=i' => sub { + _set_mode_set(@_); + $build_priority = $_[1]; + }, + 'build-priority=i' => sub { + _set_mode_set(@_); + $build_priority = $_[1]; + }, + 'list|l=s' => sub { + _set_mode(@_); + $list_state = $_[1]; + die "Unknown state to list: $list_state\n" + if not $list_state ~~ [ + qw( needs-build building uploaded built + build-attempted failed installed + dep-wait not-for-us auto-not-for-us + all failed-removed install-wait + reupload-wait bd-uninstallable ) ]; + }, + 'dist|d=s' => sub { + $distribution = $_[1]; + given ( $_[1] ) { + when ( [qw< a all >] ) { + $info_all_dists = 1; + $distribution = ''; + } + when ('o') { $distribution = 'oldstable'; } + when ('s') { $distribution = 'stable'; } + when ('t') { $distribution = 'testing'; } + when ('u') { $distribution = 'unstable'; } + } + }, + 'order|O=s' => sub { + $list_order = $_[1]; + die "Bad ordering character\n" + if $list_order !~ /^[PSpsncbCWT]+$/; + }, + 'message|m=s' => \$fail_reason, + 'database|b=s' => sub { + warn "database is deprecated, please use 'arch' instead.\n"; + $conf::dbbase = $_[1]; + }, + 'arch|A=s' => \$arch, + 'user|U=s' => \$user, + 'min-age|a=i' => \$list_min_age, + 'max-age=i' => \$list_max_age, + 'format=s' => \$printformat, + 'own-format=s' => \$ownprintformat, + 'Pas=s' => \$Pas, + 'extra-depends=s' => \$extra_depends, + 'extra-conflicts=s' => \$extra_conflicts, + + # special actions + 'export=s' => sub { _set_mode(@_); $export_to = $_[1]; }, + 'import=s' => sub { _set_mode(@_); $import_from = $_[1]; }, + 'manual-edit' => \&_set_mode, + 'distribution-architectures' => \&_set_mode, + 'distribution-aliases' => \&_set_mode, +) or usage(); +$list_min_age = -1 * $list_max_age if $list_max_age; my $dbh; @@ -299,8 +246,7 @@ foreach my $name (keys %$rows) { } $distribution = $distribution_aliases{$distribution} if (isin($distribution, keys %distribution_aliases)); -$op_mode = $category ? "set-failed" : "set-building" - if !$op_mode; # default operation +$op_mode ||= "set-building"; undef $distribution if $distribution eq 'any'; if ($distribution) { my @dists = split(/[, ]+/, $distribution); @@ -343,7 +289,7 @@ die "Can't determine your user name\n" !($user = $real_user); if (!$fail_reason) { - if ($op_mode eq "set-failed" && !$category) { + if ($op_mode eq "set-failed" ) { print "Enter reason for failing (end with '.' alone on ". "its line):\n"; my $line; @@ -503,60 +449,105 @@ sub process { } } -sub add_packages { - my $newstate = shift; - my( $package, $name, $version, $ok, $reason ); - - foreach $package (@_) { - $package =~ s,^.*/,,; # strip path - $package =~ s/\.(dsc|diff\.gz|tar\.gz|deb)$//; # strip extension - $package =~ s/_[a-zA-Z\d-]+\.changes$//; # strip extension - if ($package =~ /^([\w\d.+-]+)_([\w\d:.+~-]+)/) { - ($name,$version) = ($1,$2); - } - else { - warn "$package: can't extract package name and version ". - "(bad format)\n"; - next; - } - if ($op_mode eq "set-building") { - add_one_building( $name, $version ); - } - elsif ($op_mode eq "set-built") { - add_one_built( $name, $version ); - } - elsif ($op_mode eq "set-attempted") { - add_one_attempted( $name, $version ); - } - elsif ($op_mode eq "set-uploaded") { - add_one_uploaded( $name, $version ); - } - elsif ($op_mode eq "set-failed") { - add_one_failed( $name, $version ); - } - elsif ($op_mode eq "set-not-for-us") { - add_one_notforus( $name, $version ); - } - elsif ($op_mode eq "set-needs-build") { - add_one_needsbuild( $name, $version ); - } - elsif ($op_mode eq "set-dep-wait") { - add_one_depwait( $name, $version ); - } - elsif ($op_mode eq "set-build-priority") { - set_one_buildpri( $name, $version, 'buildpri' ); - } - elsif ($op_mode eq "set-permanent-build-priority") { - set_one_buildpri( $name, $version, 'permbuildpri' ); - } - elsif ($op_mode eq "set-binary-nmu") { - set_one_binnmu( $name, $version ); - } - elsif ($op_mode eq "set-update") { - set_one_update( $name, $version ); - } +BEGIN { + $actions = { + 'set-building' => { 'noversion' => 1, 'nopkgdef' => 1, }, + 'set-built' => { 'builder' => 1, to => 'Built', action => 'built', 'from' => [qw]}, + 'set-attempted' => { 'builder' => 1, to => 'Build-Attempted', action => 'attempted', 'from' => [qw]}, + 'set-uploaded' => { 'builder' => 1, 'noversion' => 1 }, + 'set-dep-wait' => { 'builder' => 1, }, + 'set-update' => { 'noversion' => 1, } + + }; +} + +sub add_packages { + my $newstate = shift; + my( $package, $name, $version, $ok, $reason ); + + foreach $package (@_) { + $package =~ s,^.*/,,; # strip path + $package =~ s/\.(dsc|diff\.gz|tar\.gz|deb)$//; # strip extension + $package =~ s/_[a-zA-Z\d-]+\.changes$//; # strip extension + if ($package =~ /^([\w\d.+-]+)_([\w\d:.+~-]+)/) { + ($name,$version) = ($1,$2); + } else { + warn "$package: can't extract package name and version (bad format)\n"; + next; } + + my $pkg = get_source_info($name); + if (!($actions->{$op_mode}) || !($actions->{$op_mode}->{'nopkgdef'})) { + if (!defined($pkg)) { + print "$name: not registered yet.\n"; + next; + } + } + if ($actions->{$op_mode} && $actions->{$op_mode}->{'builder'}) { + if ($pkg->{'builder'} && $user ne $pkg->{'builder'}) { + print "$pkg->{'package'}: not taken by you, but by $pkg->{'builder'}. Skipping.\n"; + next; + } + } + if (!($actions->{$op_mode}) || !($actions->{$op_mode}->{'noversion'})) { + if ( !pkg_version_eq($pkg,$version)) { + print "$pkg->{package}: version mismatch ($pkg->{'version'} by $pkg->{'builder'})\n"; + next; + } + } + + if ($actions->{$op_mode} && $actions->{$op_mode}->{'from'}) { + if (!isin($pkg->{'state'}, @{$actions->{$op_mode}->{'from'}})) { + print "$name: skiping: state is $pkg->{'state'}, not in ".join(", ",@{$actions->{$op_mode}->{'from'}})."\n"; + next; + } + } + + if ($op_mode eq "set-building") { + add_one_building( $name, $version, $pkg ); + } + elsif ($op_mode eq "set-built") { + 1; + } + elsif ($op_mode eq "set-attempted") { + 1; + } + elsif ($op_mode eq "set-uploaded") { + add_one_uploaded( $name, $version, $pkg ); + } + elsif ($op_mode eq "set-failed") { + add_one_failed( $pkg ); + } + elsif ($op_mode eq "set-not-for-us") { + add_one_notforus( $pkg ); + } + elsif ($op_mode eq "set-needs-build") { + add_one_needsbuild( $pkg ); + } + elsif ($op_mode eq "set-dep-wait") { + add_one_depwait( $pkg ); + } + elsif ($op_mode eq "set-build-priority") { + set_one_buildpri( 'buildpri', $pkg ); + } + elsif ($op_mode eq "set-permanent-build-priority") { + set_one_buildpri( 'permbuildpri', $pkg ); + } + elsif ($op_mode eq "set-binary-nmu") { + set_one_binnmu( $name, $version, $pkg ); + } + elsif ($op_mode eq "set-update") { + set_one_update( $pkg ); + } + + if ($actions->{$op_mode} && $actions->{$op_mode}->{'action'} && $actions->{$op_mode}->{'to'}) { + change_state( \$pkg, $actions->{$op_mode}->{'to'} ); + log_ta( $pkg, "--".$actions->{$op_mode}->{'action'} ); + update_source_info($pkg); + print "$name: registered as ".$actions->{$op_mode}->{'action'}."\n" if $verbose; + } + } } sub add_one_building { @@ -565,7 +556,7 @@ sub add_one_building { my( $ok, $reason ); $ok = 1; - my $pkg = get_source_info($name); + my $pkg = shift; if (defined($pkg)) { if ($pkg->{'state'} eq "Not-For-Us") { $ok = 0; @@ -719,78 +710,11 @@ sub add_one_building { } } -sub add_one_attempted { - my $name = shift; - my $version = shift; - my $pkg = get_source_info($name); - - if (!defined($pkg)) { - print "$name: not registered yet.\n"; - return; - } - - if (($pkg->{'state'} ne "Building") && ($pkg->{'state'} ne "Build-Attempted")) { - print "$name: not taken for building (state is $pkg->{'state'}). ", - "Skipping.\n"; - return; - } - if ($pkg->{'builder'} ne $user) { - print "$name: not taken by you, but by $pkg->{'builder'}. Skipping.\n"; - return; - } - elsif ( !pkg_version_eq($pkg, $version) ) { - print "$name: version mismatch ". - "$(pkg->{'version'} ". - "by $pkg->{'builder'})\n"; - return; - } - - change_state( \$pkg, 'Build-Attempted' ); - log_ta( $pkg, "--attempted" ); - update_source_info($pkg); - print "$name: registered as uploaded\n" if $verbose; -} - -sub add_one_built { - my $name = shift; - my $version = shift; - my $pkg = get_source_info($name); - - if (!defined($pkg)) { - print "$name: not registered yet.\n"; - return; - } - - if (($pkg->{'state'} ne "Building") && ($pkg->{'state'} ne "Build-Attempted")) { - print "$name: not taken for building (state is $pkg->{'state'}). ", - "Skipping.\n"; - return; - } - if ($pkg->{'builder'} ne $user) { - print "$name: not taken by you, but by $pkg->{'builder'}. Skipping.\n"; - return; - } - elsif ( !pkg_version_eq($pkg, $version) ) { - print "$name: version mismatch ". - "$(pkg->{'version'} ". - "by $pkg->{'builder'})\n"; - return; - } - change_state( \$pkg, 'Built' ); - log_ta( $pkg, "--built" ); - update_source_info($pkg); - print "$name: registered as built\n" if $verbose; -} sub add_one_uploaded { my $name = shift; my $version = shift; - my $pkg = get_source_info($name); - - if (!defined($pkg)) { - print "$name: not registered yet.\n"; - return; - } + my $pkg = shift; if ($pkg->{'state'} eq "Uploaded" && pkg_version_eq($pkg,$version)) { @@ -802,10 +726,6 @@ sub add_one_uploaded { "Skipping.\n"; return; } - if ($pkg->{'builder'} ne $user) { - print "$name: not taken by you, but by $pkg->{'builder'}. Skipping.\n"; - return; - } # strip epoch -- buildd-uploader used to go based on the filename. # (to remove at some point) my $pkgver; @@ -831,16 +751,9 @@ sub add_one_uploaded { } sub add_one_failed { - my $name = shift; - my $version = shift; - my ($state, $cat); - my $pkg = get_source_info($name); - - if (!defined($pkg)) { - print "$name: not registered yet.\n"; - return; - } - $state = $pkg->{'state'}; + my $pkg = shift; + my $state = $pkg->{'state'}; + my $name = $pkg->{'package'}; if ($state eq "Not-For-Us") { print "$name: not suitable for this architecture anyway. Skipping.\n"; @@ -861,73 +774,28 @@ sub add_one_failed { "$pkg->{'builder'}. Skipping.\n"; return; } - elsif ( !pkg_version_eq($pkg, $version) ) { - print "$name: version mismatch ". - "$(pkg->{'version'} ". - "by $pkg->{'builder'})\n"; - return; - } - $cat = $category; - if (!$cat && $fail_reason =~ /^\[([^\]]+)\]/) { - $cat = $1; - $cat = $short_category{$cat} if exists $short_category{$cat}; - if (!isin( $cat, values %short_category )) { - print "$name: Warning: unknown category $cat; discarded\n"; - $cat = ""; - } - $fail_reason =~ s/^\[[^\]]+\][ \t]*\n*//; - } - - if ($state eq "Needs-Build") { - print "$name: Warning: not registered for building previously, ". - "but processing anyway.\n"; - } - elsif ($state eq "Uploaded") { - print "$name: Warning: marked as uploaded previously, ". - "but processing anyway.\n"; - } - elsif ($state eq "Dep-Wait") { - print "$name: Warning: marked as waiting for dependencies, ". - "but processing anyway.\n"; - } - elsif ($state eq "BD-Uninstallable") { - print "$name: Warning: marked as having uninstallable build-dependencies, ". - "but processing anyway.\n"; + if (isin($state, qw)) { + print "add_one_failed: $name: Warning: not registered for building previously (but $state), processing anyway.\n"; } elsif ($state eq "Failed") { print "$name: already registered as failed; will append new message\n" if $fail_reason; - print "$name: already registered as failed; changing category\n" - if $cat; - } - - if (($cat eq "reminder-sent" || $cat eq "nmu-offered") && - defined $pkg->{'failed_category'} && - $pkg->{'failed_category'} ne $cat) { - (my $action = $cat) =~ s/-/ /; - $fail_reason .= "\n$short_date: $action"; } change_state( \$pkg, 'Failed' ); $pkg->{'builder'} = $user; $pkg->{'failed'} .= "\n" if $pkg->{'failed'}; $pkg->{'failed'} .= $fail_reason; - $pkg->{'failed_category'} = $cat if $cat; - if (defined $pkg->{'permbuildpri'}) { - $pkg->{'buildpri'} = $pkg->{'permbuildpri'}; - } else { - delete $pkg->{'buildpri'}; - } log_ta( $pkg, "--failed" ); update_source_info($pkg); print "$name: registered as failed\n" if $verbose; } sub add_one_notforus { - my $name = shift; - my $version = shift; - my $pkg = get_source_info($name); + my $pkg = shift; + my $state = $pkg->{'state'}; + my $name = $pkg->{'package'}; if ($pkg->{'state'} eq 'Not-For-Us') { # reset Not-For-Us state in case it's called twice; this is @@ -956,7 +824,6 @@ sub add_one_notforus { $pkg->{'package'} = $name; delete $pkg->{'builder'}; delete $pkg->{'depends'}; - delete $pkg->{'buildpri'}; delete $pkg->{'binary_nmu_version'}; delete $pkg->{'binary_nmu_changelog'}; log_ta( $pkg, "--no-build" ); @@ -975,16 +842,9 @@ sub add_one_notforus { } sub add_one_needsbuild { - my $name = shift; - my $version = shift; - my $state; - my $pkg = get_source_info($name); - - if (!defined($pkg)) { - print "$name: not registered; can't give back.\n"; - return; - } - $state = $pkg->{'state'}; + my $pkg = shift; + my $state = $pkg->{'state'}; + my $name = $pkg->{'package'}; if ($state eq "BD-Uninstallable") { if ($opt_override) { @@ -1033,11 +893,6 @@ sub add_one_needsbuild { "$pkg->{'builder'}. Skipping.\n"; return; } - if (!pkg_version_eq($pkg, $version)) { - print "$name: version mismatch ($pkg->{'version'} registered). ", - "Skipping.\n"; - return; - } if (!defined $distributions{$distribution}{noadw}) { change_state( \$pkg, 'BD-Uninstallable' ); $pkg->{'bd_problem'} = "Installability of build dependencies not tested yet"; @@ -1054,21 +909,8 @@ sub add_one_needsbuild { sub set_one_binnmu { my $name = shift; my $version = shift; - my $pkg = get_source_info($name); - my $state; - - if (!defined($pkg)) { - print "$name: not registered; can't register for binNMU.\n"; - return; - } - my $db_ver = $pkg->{'version'}; - - if (!version_eq($db_ver, $version)) { - print "$name: version mismatch ($db_ver registered). ", - "Skipping.\n"; - return; - } - $state = $pkg->{'state'}; + my $pkg = shift; + my $state = $pkg->{'state'}; if (defined $pkg->{'binary_nmu_version'}) { if ($binNMUver == 0) { @@ -1077,6 +919,7 @@ sub set_one_binnmu { delete $pkg->{'depends'}; delete $pkg->{'binary_nmu_version'}; delete $pkg->{'binary_nmu_changelog'}; + delete $pkg->{'buildpri'}; } elsif ($binNMUver <= $pkg->{'binary_nmu_version'}) { print "$name: already building binNMU $pkg->{'binary_nmu_version'}\n"; return; @@ -1084,8 +927,7 @@ sub set_one_binnmu { $pkg->{'binary_nmu_version'} = $binNMUver; $pkg->{'binary_nmu_changelog'} = $fail_reason; $pkg->{'notes'} = 'out-of-date'; - $pkg->{'buildpri'} = $pkg->{'permbuildpri'} - if (defined $pkg->{'permbuildpri'}); + delete $pkg->{'buildpri'}; if (defined $distributions{$distribution}{noadw}) { change_state( \$pkg, 'Installed' ); } else { @@ -1125,23 +967,17 @@ sub set_one_binnmu { $pkg->{'binary_nmu_version'} = $binNMUver; $pkg->{'binary_nmu_changelog'} = $fail_reason; $pkg->{'notes'} = 'out-of-date'; + delete $pkg->{'buildpri'}; log_ta( $pkg, "--binNMU" ); update_source_info($pkg); print "${name}: registered for binNMU $fullver\n" if $verbose; } sub set_one_buildpri { - my $name = shift; - my $version = shift; my $key = shift; - my $pkg = get_source_info($name); - my $state; - - if (!defined($pkg)) { - print "$name: not registered; can't set priority.\n"; - return; - } - $state = $pkg->{'state'}; + my $pkg = shift; + my $state = $pkg->{'state'}; + my $name = $pkg->{'package'}; if ($state eq "Not-For-Us") { print "$name: not suitable for this architecture. Skipping.\n"; @@ -1150,36 +986,19 @@ sub set_one_buildpri { print "$name: failed previously and doesn't need building. Skipping.\n"; return; } - if (!pkg_version_eq($pkg, $version)) { - print "$name: version mismatch ($pkg->{'version'} registered). ", - "Skipping.\n"; - return; - } - if ( $build_priority == 0 ) { - delete $pkg->{'buildpri'} - if $key eq 'permbuildpri' and defined $pkg->{'buildpri'} - and $pkg->{'buildpri'} == $pkg->{$key}; - delete $pkg->{$key}; - } else { - $pkg->{'buildpri'} = $build_priority - if $key eq 'permbuildpri'; + if ( $build_priority ) { $pkg->{$key} = $build_priority; + } else { + delete $pkg->{$key}; } update_source_info($pkg); print "$name: set to build priority $build_priority\n" if $verbose; } sub add_one_depwait { - my $name = shift; - my $version = shift; - my $state; - my $pkg = get_source_info($name); - - if (!defined($pkg)) { - print "$name: not registered yet.\n"; - return; - } - $state = $pkg->{'state'}; + my $pkg = shift; + my $state = $pkg->{'state'}; + my $name = $pkg->{'package'}; if ($state eq "Dep-Wait") { print "$name: merging with previously registered dependencies\n"; @@ -1189,46 +1008,19 @@ sub add_one_depwait { print "$name: Warning: not registered for building previously, ". "but processing anyway.\n"; } - elsif ($state eq "Not-For-Us") { - print "$name: not suitable for this architecture anyway. Skipping.\n"; - return; - } - elsif ($state eq "Failed-Removed") { - print "$name: failed previously and doesn't need building. Skipping.\n"; - return; - } - elsif ($state eq "Installed") { - print "$name: Is already installed in archive. Skipping.\n"; - return; - } - elsif ($state eq "Uploaded") { - print "$name: Is already uploaded. Skipping.\n"; - return; - } - elsif ($pkg->{'builder'} && - $user ne $pkg->{'builder'}) { - print "$name: not taken by you, but by ". - "$pkg->{'builder'}. Skipping.\n"; - return; - } - elsif ( !pkg_version_eq($pkg,$version)) { - print "$name: version mismatch ". - "($pkg->{'version'} ". - "by $pkg->{'builder'})\n"; - return; - } - elsif ($fail_reason =~ /^\s*$/ || + + if (isin( $state, qw)) { + print "add_one_depwait: $name: skiping in state $state\n"; + return; + } + + if ($fail_reason =~ /^\s*$/ || !parse_deplist( $fail_reason, 1 )) { print "$name: Bad dependency list\n"; return; } change_state( \$pkg, 'Dep-Wait' ); $pkg->{'builder'} = $user; - if (defined $pkg->{'permbuildpri'}) { - $pkg->{'buildpri'} = $pkg->{'permbuildpri'}; - } else { - delete $pkg->{'buildpri'}; - } my $deplist = parse_deplist( $pkg->{'depends'} ); my $new_deplist = parse_deplist( $fail_reason ); # add new dependencies, maybe overwriting old entries @@ -1236,27 +1028,19 @@ sub add_one_depwait { $deplist->{$_} = $new_deplist->{$_}; } $pkg->{'depends'} = build_deplist($deplist); - log_ta( $pkg, "--dep-wait" ); - update_source_info($pkg); - print "$name: registered as waiting for dependencies\n" if $verbose; + log_ta( $pkg, "--dep-wait" ) unless $simulate; + update_source_info($pkg) unless $simulate; + print "$name: registered as waiting for dependencies\n" if $verbose || $simulate; } 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; - } + my $pkg = shift; $pkg->{'version'} =~ s/\+b[0-9]+$//; log_ta( $pkg, "--update" ); update_source_info($pkg); } - # for sorting priorities and sections BEGIN { %prioval = ( required => -5, @@ -1326,28 +1110,18 @@ BEGIN { } $sectval{'unknown'} = -165; - %catval = ( "none" => -20, - "uploaded-fixed-pkg" => -19, - "fix-expected" => -18, - "reminder-sent" => -17, - "nmu-offered" => -16, - "easy" => -15, - "medium" => -14, - "hard" => -13, - "compiler-error" => -12 ); } sub sort_list_func { my $map_funcs = { 'C' => ['<->', sub { return $_[0]->{'calprio'}; }], 'W' => ['<->', sub { return $_[0]->{'state_days'}; }], - 'P' => ['<->', sub { return $_[0]->{'buildpri'}; }], + 'P' => ['<->', sub { return ($_[0]->{'buildpri'}//0) + ($_[0]->{'permbuildpri'}//0); }], 'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}//""}//0; }], 's' => ['<=>', sub { return $sectval{$_[0]->{'section'}//""}//0; }], 'n' => ['cmp', sub { return $_[0]->{'package'}; }], 'b' => ['cmp', sub { return $_[0]->{'builder'}; }], '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 isin($_[0]->{'priority'}, qw(required important standard)); }], 'T' => ['<->', sub { return $_[0]->{'state_time'} % 86400;} ], # Fractions of a day }; @@ -1365,7 +1139,7 @@ sub sort_list_func { sub calculate_prio { my $priomap = $yamlmap->{priority}; my $pkg = shift; - my @s=split("/", $pkg->{'section'}); + my @s=split("/", $pkg->{'section'}//""); $pkg->{'component'} = $s[0] if $s[1]; $pkg->{'component'} ||= 'main'; $pkg->{'calprio'} = 0; @@ -1487,7 +1261,7 @@ Text could contain further %. To start with !, use %! no warnings; my $c = "$pkg->{'priority'}:$pkg->{'notes'}"; $c .= ":PREV-FAILED" if $pkg->{'previous_state'} && $pkg->{'previous_state'} =~ /^Failed/; - $c .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'}; + $c .= ":bp{" . (($pkg->{'buildpri'}//0)+($pkg->{'permbuildpri'}//0)) . "}" if (($pkg->{'buildpri'}//0)+($pkg->{'permbuildpri'}//0)); $c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'}; $c .= ":calprio{". $pkg->{'calprio'}."}"; $c .= ":days{". $pkg->{'state_days'}."}"; @@ -1521,15 +1295,15 @@ Text could contain further %. To start with !, use %! sub list_packages { my $state = shift; - my( $name, $pkg, @list ); + my @list; my $cnt = 0; my %scnt; my $ctime = time; - my $db = get_all_source_info(state => $state, user => $user, category => $category, list_min_age => $list_min_age); - foreach $name (keys %$db) { - next if $name =~ /^_/; - push @list, calculate_prio($db->{$name}); + my $db = get_all_source_info(state => $state, user => $user, list_min_age => $list_min_age, multisuite => 1); + foreach my $key (keys %$db) { + next if $key =~ /^_/; + push @list, calculate_prio($db->{$key}); } # filter components @@ -1543,7 +1317,8 @@ sub list_packages { $printformat ||= $yamlmap->{"format"}{"default"}{"default"}; undef $printformat if ($ownprintformat && $ownprintformat eq 'none'); - foreach $pkg (sort sort_list_func @list) { + foreach my $pkg (sort sort_list_func @list) { + no warnings; if ($printformat) { print print_format($printformat, $pkg, {'cnt' => $cnt, 'scnt' => \%scnt})."\n"; ++$cnt; @@ -1557,9 +1332,6 @@ sub list_packages { if $pkg->{'state'} ne "Needs-Build"; print print_format(" [%X]\n", $pkg, {}); print " Reasons for failing:\n", - " [Category: ", - defined $pkg->{'failed_category'} ? $pkg->{'failed_category'} : "none", - "]\n ", join("\n ",split("\n",$pkg->{'failed'})), "\n" if $pkg->{'state'} =~ /^Failed/; print " Dependencies: $pkg->{'depends'}\n" @@ -1602,7 +1374,7 @@ sub info_packages { 'bd_problem' => 'BD-Problem', 'binary_nmu_changelog' => 'Binary-NMU-Changelog', 'binary_nmu_version' => 'Binary-NMU-Version', 'buildpri' => 'BuildPri', 'depends' => 'Depends', 'failed' => 'Failed', - 'failed_category' => 'Failed-Category', 'notes' => 'Notes', + 'notes' => 'Notes', 'distribution' => 'Distribution', 'old_failed' => 'Old-Failed', 'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel', 'calprio' => 'CalculatedPri', 'state_days' => 'State-Days', 'state_time' => 'State-Time', @@ -1652,6 +1424,7 @@ sub info_packages { } sub forget_packages { + no warnings; my( $name, $pkg, $key, $data ); foreach $name (@_) { @@ -1801,7 +1574,6 @@ sub change_state { ($pkg->{'failed'} // ""). "\n" . ($pkg->{'old_failed'} // ""); delete $pkg->{'failed'}; - delete $pkg->{'failed_category'}; } if (defined($$state) and $$state eq 'BD-Uninstallable') { delete $pkg->{'bd_problem'}; @@ -1872,6 +1644,7 @@ sub parse_deplist { my $verify = shift; my %result; + return $verify ? 0 : \%result unless $deps; foreach (split( /\s*,\s*/, $deps )) { if ($verify) { # verification requires > starting prompts, no | crap @@ -2228,7 +2001,7 @@ 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, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time" + my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, 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" @@ -2252,7 +2025,7 @@ 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, floor(extract(epoch from now()) - extract(epoch from state_change)) as state_time" + my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, 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, extra_depends, extra_conflicts" @@ -2283,12 +2056,6 @@ sub get_all_source_info { push @args, $options{user}; } - if ($options{category}) { - $q .= ' AND failed_category <> ? AND upper(state) = ? '; - push @args, $options{category}; - push @args, "FAILED"; - } - if ($options{list_min_age} && $options{list_min_age} > 0) { $q .= ' AND age(state_change) > ? '; push @args, $options{list_min_age} . " days"; @@ -2299,7 +2066,20 @@ sub get_all_source_info { push @args, -$options{list_min_age} . " days"; } - my $db = $dbh->selectall_hashref($q, 'package', undef, @args); + my $db; + if (($options{multisuite}) && (!$distribution || $distribution =~ / /)) { + # return packages in multiple suites - only for those functions marked as clean for that api change + $db = $dbh->selectall_hashref($q, [qw], undef, @args); + my $dbk = {}; + foreach my $p ( keys %$db ) { + foreach my $d (keys %{$db->{$p}}) { + $dbk->{"$p/$d"} = $db->{$p}->{$d}; + } + } + $db = $dbk; + } else { + $db = $dbh->selectall_hashref($q, [qw], undef, @args); + } return $db; } @@ -2348,7 +2128,6 @@ sub update_source_info { 'old_failed = ?, ' . 'binary_nmu_version = ?, ' . 'binary_nmu_changelog = ?, ' . - 'failed_category = ?, ' . 'permbuildpri = ?, ' . 'buildpri = ?, ' . 'depends = ?, ' . @@ -2370,7 +2149,6 @@ sub update_source_info { $pkg->{'old_failed'}, $pkg->{'binary_nmu_version'}, $pkg->{'binary_nmu_changelog'}, - $pkg->{'failed_category'}, $pkg->{'permbuildpri'}, $pkg->{'buildpri'}, $pkg->{'depends'}, @@ -2455,12 +2233,13 @@ sub parse_all_v3 { foreach my $name (keys %$srcs) { next if $name eq '_binary'; - # state = installed, out-of-date, uncompiled, not-for-us, auto-not-for-us + # state = installed, out-of-date, uncompiled, packages-arch-specific, overwritten-by-arch-all, arch-not-in-arch-list, arch-all-only my $pkgs = $srcs->{$name}; + next if isin($pkgs->{'status'}, qw ); my $pkg = $db->{$name}; unless ($pkg) { - next SRCS if $pkgs->{'status'} eq 'not-for-us'; + next SRCS if $pkgs->{'status'} eq 'packages-arch-specific'; 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 @@ -2472,18 +2251,22 @@ sub parse_all_v3 { } $pkg->{'package'} = $name; } + $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'}):"; + ", $pkg->{'state'}".($pkg->{'notes'} ? "/".$pkg->{'notes'} : "")."):"; if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && ($pkgs->{'binnmu'}//0) < int($pkg->{'binary_nmu_version'}//0)) { $pkgs->{'status'} = 'out-of-date'; } - if (isin($pkgs->{'status'}, qw (installed related auto-not-for-us))) { + if (isin($pkgs->{'status'}, qw )) { my $change = 0; - my $tstate = {'installed' => 'Installed', 'related' => 'Installed', 'auto-not-for-us' => 'Auto-Not-For-Us'}->{$pkgs->{'status'}}; + my $tstate = {'installed' => 'Installed', 'related' => 'Installed', + 'arch-not-in-arch-list' => 'Auto-Not-For-Us', 'packages-arch-specific' => 'Auto-Not-For-Us', 'overwritten-by-arch-all' => 'Auto-Not-For-Us', 'arch-all-only' => 'Auto-Not-For-Us', + }->{$pkgs->{'status'}}; next if isin( $pkg->{'state'}, qw) && isin( $tstate, qw); # if the package is currently current, the status is Installed, not not-for-us if ($pkg->{'state'} ne $tstate) { @@ -2503,9 +2286,12 @@ sub parse_all_v3 { $change++; } } - if (isin($pkgs->{'status'}, qw (related)) and $pkg->{'notes'} ne "related") { - $pkg->{'notes'} = "related"; - $change++; + if (isin($pkgs->{'status'}, qw )) { + my $tnotes = $pkgs->{'status'}; + if (($pkg->{'notes'}//"") ne $tnotes) { + $pkg->{'notes'} = $tnotes; + $change++; + } } if ($change) { print "$logstr set to $tstate/".($pkg->{'notes'}//"")."\n" if $verbose || $simulate; @@ -2515,21 +2301,6 @@ sub parse_all_v3 { next; } - if ($pkgs->{'status'} eq 'not-for-us') { - next if isin( $pkg->{'state'}, qw(Not-For-Us Installed Failed-Removed)); - - if (isin( $pkg->{'state'}, qw(Failed Build-Attempted Built))) { - change_state( \$pkg, "Failed-Removed" ); - log_ta( $pkg, "--merge-v3: Failed-Removed" ) unless $simulate; - update_source_info($pkg) unless $simulate; - print "$logstr (virtually) deleted from database\n" if $verbose || $simulate; - next; - } - - print "$logstr should delete (not-for-us according to P-a-s)\n" if $verbose || $simulate || 1; # not implemented yet on purpose - next; - } - # 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"; @@ -2561,6 +2332,7 @@ sub parse_all_v3 { delete $pkg->{'builder'}; delete $pkg->{'binary_nmu_version'} unless $pkgs->{'binnmu'}; delete $pkg->{'binary_nmu_changelog'} unless $pkgs->{'binnmu'}; + delete $pkg->{'buildpri'}; 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;