X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=5a32603271c3deeadef2aa5b3600608a4570f925;hb=2038009de5c47bb0e2e369b42a04024e498bcf71;hp=5b3afb15c92017c2ab9c8f2e527a984b08cbad8c;hpb=bf263c8438b11ee7acb1308cf96bfca49ff2781f;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index 5b3afb1..5a32603 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -160,7 +160,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 => @@ -181,7 +181,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. @@ -269,6 +269,15 @@ END { } } +if ($distribution eq 'any-priv') { + $privmode = 'yes'; + $distribution = 'any'; +} +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')) { @@ -287,12 +296,15 @@ $dbh->{pg_server_prepare} = 0; $dbh->begin_work or die $dbh->errstr; -my $q = 'SELECT distribution, public, auto_dep_wait FROM distributions'; +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'; @@ -305,14 +317,6 @@ $distribution = $distribution_aliases{$distribution} if (isin($distribution, key $op_mode = $category ? "set-failed" : "set-building" if !$op_mode; # default operation $distribution ||= "sid"; -if ($distribution eq 'any-priv') { - $privmode = 'yes'; - $distribution = 'any'; -} -if ($distribution eq 'any-unpriv') { - $privmode = 'no'; - $distribution = 'any'; -} undef $distribution if $distribution eq 'any'; if ($distribution) { my @dists = split(/[, ]+/, $distribution); @@ -784,6 +788,10 @@ sub add_one_building { 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; @@ -1120,7 +1128,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 { @@ -1900,9 +1908,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'}; }], @@ -1910,10 +1918,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; @@ -1938,6 +1948,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'}; @@ -1990,7 +2007,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 @@ -2024,6 +2043,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), @@ -2153,11 +2173,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', 'extra_depends' => 'Extra-Dependencies', 'extra_conflicts' => 'Extra-Conflicts', + 'build_arch_all' => 'Build-Arch-All', ); foreach $name (@_) { @@ -2301,7 +2322,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 ) ); } @@ -2779,10 +2800,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" + . ", extra_depends, extra_conflicts, build_arch_all" . " FROM " . table_name() . ' WHERE package = ? AND distribution = ?'; my $pkg = $dbh->selectrow_hashref( $q, @@ -2793,7 +2814,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); @@ -2803,7 +2824,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" + 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, extra_depends, extra_conflicts" @@ -3007,13 +3028,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'}}) { @@ -3026,7 +3047,7 @@ sub parse_all_v3() { } my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'}". ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : ""). - "($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}". + " ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}". ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : ""). ", $pkg->{'state'}):"; @@ -3076,6 +3097,17 @@ 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";