X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=9080dc7bf99b8842d390def9715ebde9168334ca;hb=7dce194de7116a1a957c3b4620cbfe12485afd6b;hp=2c0a589987791b1bc2d28d032ebdb70642937fc7;hpb=fde1d0c4b108d362d46016b43547dea2cc9fec9a;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index 2c0a589..9080dc7 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -41,6 +41,12 @@ use File::Copy; use DBI; use lib '/org/wanna-build/bin'; use WannaBuild; +use YAML::Tiny; +use Data::Dumper; +use Hash::Merge qw ( merge ); +use String::Format; +use Date::Parse; +use List::Util qw[max]; our ($verbose, $mail_logs, $list_order, $list_state, $curr_date, $op_mode, $user, $real_user, $distribution, @@ -49,10 +55,13 @@ our ($verbose, $mail_logs, $list_order, $list_state, $info_all_dists, $arch, $category, %catval, %short_category, $short_date, $list_min_age, $dbbase, @curr_time, - $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc); + $build_priority, %new_vers, $binNMUver, %merge_srcvers, %merge_binsrc, + $printformat, $ownprintformat, $privmode + ); # global vars $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/"; +$ENV{'LC_ALL'} = 'C'; $verbose = 0; $mail_logs = ""; @curr_time = gmtime; @@ -156,7 +165,7 @@ my %options = { short => "O", arg => \$list_order, code => sub { die "Bad ordering character\n" - if $list_order !~ /^[PSpsncb]+$/; + if $list_order !~ /^[PSpsncbCW]+$/; } }, message => { short => "m", arg => \$fail_reason }, # database is deprecated, use arch instead. @@ -181,6 +190,8 @@ my %options = if $list_min_age == 0; $list_min_age *= -1; } }, + "format" => { arg => \$printformat }, + "own-format" => { arg => \$ownprintformat }, # special actions export => { arg => \$export_to, mode => "export" }, import => { arg => \$import_from, mode => "import" }, @@ -230,11 +241,26 @@ while( @ARGV && $ARGV[0] =~ /^-/ ) { $op_mode = $category ? "set-failed" : "set-building" if !$op_mode; # default operation -$list_order = $list_state eq "failed" ? 'fPcpsn' : 'PScpsn' - if !$list_order and $list_state; $distribution ||= "unstable"; -die "Bad distribution '$distribution'\n" - if !isin($distribution, keys %conf::distributions); +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); + foreach my $dist (@dists) { + die "Bad distribution '$distribution'\n" + if !isin($dist, keys %conf::distributions); + } +} +if (!isin ( $op_mode, qw(list) ) && ( !$distribution || $distribution =~ /[ ,]/)) { + die "multiple distributions are only allowed for list"; +} # If they didn't specify an arch, try to get it from database name which # is in the form of $arch/build-db @@ -294,6 +320,26 @@ if (!$fail_reason) { } } +my $yamlmap = (); +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) { push ( @files, "$user.yaml"); } +foreach my $file (@files) { + my $cfile = File::Spec->rel2abs( $file, $yamldir ); + if ($verbose >= 2) { print "Trying to read $file ($cfile) ...\n"; } + next unless -f $cfile; + if ($verbose >= 2) { print "Read $file ($cfile) ...\n"; } + my $m = YAML::Tiny->read( $cfile )->[0]; + $yamlmap = merge($m, $yamlmap); +} +if (not $yamlmap) { + die "FATAL: no configuration found\n"; +} +$list_order = $yamlmap->{"list-order"}{$list_state} if !$list_order and $list_state; +$list_order ||= $yamlmap->{"list-order"}{'default'}; + my $dbh; END { @@ -304,7 +350,7 @@ END { } my $schema_suffix = ''; -if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /-/)) { +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'; @@ -672,7 +718,7 @@ sub add_one_attempted { return; } - if ($pkg->{'state'} ne "Building" ) { + if (($pkg->{'state'} ne "Building") && ($pkg->{'state'} ne "Build-Attempted")) { print "$name: not taken for building (state is $pkg->{'state'}). ", "Skipping.\n"; return; @@ -704,7 +750,7 @@ sub add_one_built { return; } - if ($pkg->{'state'} ne "Building" ) { + if (($pkg->{'state'} ne "Building") && ($pkg->{'state'} ne "Build-Attempted")) { print "$name: not taken for building (state is $pkg->{'state'}). ", "Skipping.\n"; return; @@ -1286,7 +1332,7 @@ sub parse_sources { # This function looks through a Packages file and sets the state of # packages to 'Installed' sub parse_packages { - my depwait_only = shift; + my $depwait_only = shift; my $installed; my $pkgs = get_all_source_info(); @@ -1740,67 +1786,172 @@ BEGIN { } sub sort_list_func { - my( $letter, $x, $ax, $bx ); - - foreach $letter (split( "", $list_order )) { - SWITCH: foreach ($letter) { - /P/ && do { - $x = $b->{'buildpri'} <=> $a->{'buildpri'}; - return $x if $x != 0; - last SWITCH; - }; - /p/ && do { - $x = $prioval{$a->{'priority'}} <=> $prioval{$b->{'priority'}}; - return $x if $x != 0; - last SWITCH; - }; - /s/ && do { - $x = $sectval{$a->{'section'}} <=> $sectval{$b->{'section'}}; - return $x if $x != 0; - last SWITCH; - }; - /n/ && do { - $x = $a->{'package'} cmp $b->{'package'}; - return $x if $x != 0; - last SWITCH; - }; - /b/ && do { - $x = $a->{'builder'} cmp $b->{'builder'}; - return $x if $x != 0; - last SWITCH; - }; - /c/ && do { - $ax = ($a->{'notes'} =~ /^(out-of-date|partial)/) ? 0 : - ($a->{'notes'} =~ /^uncompiled/) ? 2 : 1; - $bx = ($b->{'notes'} =~ /^(out-of-date|partial)/) ? 0 : - ($b->{'notes'} =~ /^uncompiled/) ? 2 : 1; - $x = $ax <=> $bx; - return $x if $x != 0; - last SWITCH; - }; - /f/ && do { - my $ca = defined $a->{'failed_category'} ? - $a->{'failed_category'} : "none"; - my $cb = defined $b->{'failed_category'} ? - $b->{'failed_category'} : "none"; - $x = $catval{$ca} <=> $catval{$cb}; - return $x if $x != 0; - last SWITCH; - }; - /S/ && do { - my $pa = $prioval{$a->{'priority'}} > - $prioval{'standard'}; - my $pb = $prioval{$b->{'priority'}} > - $prioval{'standard'}; - $x = $pa <=> $pb; - return $x if $x != 0; - last SWITCH; - }; - } + my $map_funcs = { + 'C' => ['<=>', sub { return (-1) * $_[0]->{'calprio'}; }], + 'W' => ['<=>', sub { return (-1) * $_[0]->{'state_days'}; }], + 'P' => ['<=>', sub { return (-1) * $_[0]->{'buildpri'}; }], + 'p' => ['<=>', sub { return $prioval{$_[0]->{'priority'}}; }], + 's' => ['<=>', sub { return $sectval{$_[0]->{'section'}}; }], + '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 $prioval{$_[0]->{'priority'}} > $prioval{'standard'}; }], + }; + + foreach my $letter (split( //, $list_order )) { + my $r; + $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; } return 0; } +sub calculate_prio { + my $priomap = $yamlmap->{priority}; + my $pkg = shift; + my @s=split("/", $pkg->{'section'}); + $pkg->{'component'} = $s[0] if $s[1]; + $pkg->{'component'} ||= 'main'; + $pkg->{'calprio'} = 0; + foreach my $k (keys %{$priomap->{keys}}) { + $pkg->{'calprio'} += $priomap->{keys}->{$k}{$pkg->{$k}} if $pkg->{$k} and $priomap->{keys}->{$k}{$pkg->{$k}}; + } + + my $days = $pkg->{'state_days'}; + $days = $priomap->{'waitingdays'}->{'min'} if $priomap->{'waitingdays'}->{'min'} and $days < $priomap->{'waitingdays'}->{'min'}; + $days = $priomap->{'waitingdays'}->{'max'} if $priomap->{'waitingdays'}->{'max'} and $days > $priomap->{'waitingdays'}->{'max'}; + my $scale = $priomap->{'waitingdays'}->{'scale'} || 1; + $pkg->{'calprio'} += $days * $scale; + + $pkg->{'calprio'} += $pkg->{'permbuildpri'} if $pkg->{'permbuildpri'}; + $pkg->{'calprio'} += $pkg->{'buildpri'} if $pkg->{'buildpri'}; + + return $pkg; +} + + +sub seconds2time { + my $t = shift; + return "" unless $t; + my $sec = $t % 60; + my $min = int($t/60) % 60; + my $hours = int($t / 3600); + return sprintf("%d:%02d:%02d", $hours, $min, $sec) if $hours; + return sprintf("%d:%02d", $min, $sec); +} + + +sub use_fmt { + my $r; + + if (ref($_[0]) eq 'CODE') { + $r = &{$_[0]}; + } else { + $r = $_[0]; + } + + shift; + my $t = shift; + + $r ||= ""; + return $r unless $t; + + my $pkg = shift; + my $var = shift; + if (substr($t,0,1) eq '!') { + $t = substr($t,1); + return "" if $r; + } else { + return "" unless $r; + } + if ($t =~ /%/) { + return print_format($t, $pkg, $var); + } + return $t; +} +sub make_fmt { my $c = shift; my $pkg = shift; my $var = shift; return sub { use_fmt($c, $_[0], $pkg, $var); } }; + +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 + +a Architecture +c section (e.g. libs or utils) +D in case of BD-Uninstallable the reason for the uninstallability +d distribution +E in case of Dep-Wait the packages being waited on, in case of Needs-Build the number in the queue +F in case of Failed the fail reason +n newline +o time of last successful build (seconds) +O time of last successful build (formated) +P previous state +p Package name +q time of last build (seconds) +Q time of last build (formated) +r max time of last (successful) build (seconds) +R max time of last (successful) build (formated) +S Package state +s Time in this state in full seconds since epoch +t time of state change +u Builder (e.g. buildd_mipsel-rem) +v Package version +V full Package version (i.e. with +b.., = %v%{+b}B%B +X the string normally between [], e.g. optional:out-of-date:calprio{61}:days{25} + +%{Text}? print Text in case ? is not empty; ? is never printed +%{!Text}? print Text in case ? is empty; ? is never printed +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), + 's' => make_fmt( sub { return floor(str2time($pkg->{'state_change'})); }, $pkg, $var), + 'v' => make_fmt( $pkg->{'version'}, $pkg, $var), + 'V' => make_fmt( sub { $pkg->{'binary_nmu_version'} ? $pkg->{'version'}."+b".$pkg->{'binary_nmu_version'} : $pkg->{'version'} }, $pkg, $var), + 'S' => make_fmt( $pkg->{'state'}, $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 .= ":bp{" . $pkg->{'buildpri'} . "}" if defined $pkg->{'buildpri'}; + $c .= ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" if defined $pkg->{'binary_nmu_version'}; + $c .= ":calprio{". $pkg->{'calprio'}."}"; + $c .= ":days{". $pkg->{'state_days'}."}"; + return $c; + }, $pkg, $var), + 'c' => make_fmt( $pkg->{'section'}, $pkg, $var), + 'P' => make_fmt( $pkg->{'previous_state'} || "unknwon", $pkg, $var), + 'E' => make_fmt( sub { return $pkg->{'depends'} if $pkg->{'state'} eq "Dep-Wait"; + return $var->{scnt}{'Needs-Build'} + 1 if $pkg->{'state'} eq 'Needs-Build'; + return ""; }, $pkg, $var), + 'F' => make_fmt( sub { return "" unless $pkg->{'failed'}; + my $failed = $pkg->{'failed'}; + $failed =~ s/\\/\\\\/g; + return $pkg->{'package'}."#".$arch."-failure\n ". + join("\\0a",split("\n",$failed))."\\0a\n"; }, $pkg, $var), + 'D' => make_fmt( sub { return "" unless $pkg->{'bd_problem'}; + return $pkg->{'package'}."#".$arch."-bd-problem\n". + join("\\0a",split("\n",$pkg->{'bd_problem'}))."\\0a\n"; }, $pkg, $var), + 'B' => make_fmt( sub { return $pkg->{'binary_nmu_version'} if defined $pkg->{'binary_nmu_version'}; }, $pkg, $var), + 'd' => make_fmt( $pkg->{'distribution'}, $pkg, $var), + 't' => make_fmt( $pkg->{'state_change'}, $pkg, $var), + 'o' => make_fmt( $pkg->{'successtime'}, $pkg, $var), + '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), + )); +} + sub list_packages { my $state = shift; my( $name, $pkg, @list ); @@ -1811,23 +1962,31 @@ sub list_packages { 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, $db->{$name}; + push @list, calculate_prio($db->{$name}); } + # filter components + @list = grep { my $i = $_->{'component'}; grep { $i eq $_ } split /[, ]+/, $yamlmap->{"restrict"}{'component'} } @list; + + # first adjust ownprintformat, then set printformat accordingly + $printformat ||= $yamlmap->{"format"}{$ownprintformat}; + $printformat ||= $yamlmap->{"format"}{"default"}{$state}; + $printformat ||= $yamlmap->{"format"}{"default"}{"default"}; + undef $printformat if ($ownprintformat eq 'none'); + foreach $pkg (sort sort_list_func @list) { - print "$pkg->{'section'}/$pkg->{'package'}_$pkg->{'version'}"; - print ": $pkg->{'state'}" + if ($printformat) { + print print_format($printformat, $pkg, {'cnt' => $cnt, 'scnt' => \%scnt})."\n"; + ++$cnt; + $scnt{$pkg->{'state'}}++; + next; + } + print print_format("%c/%p_%v", $pkg, {}); + print print_format(": %S", $pkg, {}) if $state eq "all"; - print " by $pkg->{'builder'}" - if $pkg->{'state'} ne "Needs-Build" && $pkg->{'builder'}; - print " [$pkg->{'priority'}:$pkg->{'notes'}"; - print ":PREV-FAILED" - if $pkg->{'previous_state'} =~ /^Failed/; - print ":bp{" . $pkg->{'buildpri'} . "}" - if defined $pkg->{'buildpri'}; - print ":binNMU{" . $pkg->{'binary_nmu_version'} . "}" - if defined $pkg->{'binary_nmu_version'}; - print "]\n"; + print print_format("%{ by }u%u", $pkg, {}) + 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", @@ -1839,23 +1998,26 @@ sub list_packages { print " Reasons for BD-Uninstallable:\n ", join("\n ",split("\n",$pkg->{'bd_problem'})), "\n" if $pkg->{'state'} eq "BD-Uninstallable"; - print " Previous state was $pkg->{'previous_state'} until ", - "$pkg->{'state_change'}\n" + print " Previous state was $pkg->{'previous_state'}\n" if $verbose && $pkg->{'previous_state'}; print " No previous state recorded\n" if $verbose && !$pkg->{'previous_state'}; + print " State changed at $pkg->{'state_change'}\n" + if $verbose && $pkg->{'state_change'}; + print " Previous state $pkg->{'previous_state'} left $pkg->{'state_time'} ago\n" + if $verbose && $pkg->{'previous_state'}; print " Previous failing reasons:\n ", join("\n ",split("\n",$pkg->{'old_failed'})), "\n" if $verbose && $pkg->{'old_failed'}; ++$cnt; $scnt{$pkg->{'state'}}++ if $state eq "all"; } - if ($state eq "all") { + if ($state eq "all" && !$printformat) { foreach (sort keys %scnt) { print "Total $scnt{$_} package(s) in state $_.\n"; } } - print "Total $cnt package(s)\n"; + print "Total $cnt package(s)\n" unless $printformat; } @@ -1864,6 +2026,20 @@ sub info_packages { 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 %beautykeys = ( 'package' => 'Package', 'version' => 'Version', 'builder' => 'Builder', + 'state' => 'State', 'section' => 'Section', 'priority' => 'Priority', + 'installed_version' => 'Installed-Version', 'previous_state' => 'Previous-State', + 'state_change' => 'State-Change', + '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', + 'distribution' => 'Distribution', 'old_failed' => 'Old-Failed', + 'permbuildpri' => 'PermBuildPri', 'rel' => 'Rel', + 'calprio' => 'CalculatedPri', 'state_days' => 'State-Days', + 'successtime' => 'Success-build-time', + 'anytime' => 'Build-time' + ); foreach $name (@_) { $name =~ s/_.*$//; # strip version @@ -1875,6 +2051,7 @@ sub info_packages { print "$pname: not registered\n"; next; } + $pkg = calculate_prio($pkg); print "$pname:\n"; foreach $key (@firstkeys) { @@ -1884,15 +2061,7 @@ sub info_packages { $val = "\n$val" if isin( $key, qw(Failed Old-Failed)); $val =~ s/\n/\n /g; my $print_key = $key; - $print_key = 'Package' if ($key eq 'package'); - $print_key = 'Version' if ($key eq 'version'); - $print_key = 'Builder' if ($key eq 'builder'); - $print_key = 'State' if ($key eq 'state'); - $print_key = 'Section' if ($key eq 'section'); - $print_key = 'Priority' if ($key eq 'priority'); - $print_key = 'Installed-Version' if ($key eq 'installed_version'); - $print_key = 'Previous-State' if ($key eq 'previous_state'); - $print_key = 'State-Change' if ($key eq 'state_change'); + $print_key = $beautykeys{$print_key} if $beautykeys{$print_key}; printf " %-20s: %s\n", $print_key, $val; } foreach $key (sort keys %$pkg) { @@ -1903,18 +2072,7 @@ sub info_packages { $val = "\n$val" if isin( $key, qw(Failed Old-Failed)); $val =~ s/\n/\n /g; my $print_key = $key; - $print_key = 'BD-Problem' if ($key eq 'bd_problem'); - $print_key = 'Binary-NMU-Changelog' if ($key eq 'binary_nmu_changelog'); - $print_key = 'Binary-NMU-Version' if ($key eq 'binary_nmu_version'); - $print_key = 'BuildPri' if ($key eq 'buildpri'); - $print_key = 'Depends' if ($key eq 'depends'); - $print_key = 'Failed' if ($key eq 'failed'); - $print_key = 'Failed-Category' if ($key eq 'failed_category'); - $print_key = 'Notes' if ($key eq 'notes'); - $print_key = 'Distribution' if ($key eq 'distribution'); - $print_key = 'Old-Failed' if ($key eq 'old_failed'); - $print_key = 'PermBuildPri' if ($key eq 'permbuildpri'); - $print_key = 'Rel' if ($key eq 'rel'); + $print_key = $beautykeys{$print_key} if $beautykeys{$print_key}; printf " %-20s: %s\n", $print_key, $val; } } @@ -2063,6 +2221,7 @@ sub change_state { return if defined($$state) and $$state eq $newstate; $pkg->{'previous_state'} = $$state if defined($$state); $pkg->{'state_change'} = $curr_date; + $pkg->{'do_state_change'} = 1; if (defined($$state) and $$state eq 'Failed') { $pkg->{'old_failed'} = @@ -2353,17 +2512,26 @@ sub transactions_table_name { return '"' . $arch . $schema_suffix . '".transactions'; } +sub pkg_history_table_name { + return '"' . $arch . $schema_suffix . '".pkg_history'; +} + sub get_readonly_source_info { my $name = shift; - my $pkg = $dbh->selectrow_hashref('SELECT * FROM ' . - table_name() . ' WHERE package = ? AND distribution = ?', + # 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" + . ", (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" + . " FROM " . table_name() + . ' WHERE package = ? AND distribution = ?'; + my $pkg = $dbh->selectrow_hashref( $q, undef, $name, $distribution); return $pkg; } sub get_source_info { my $name = shift; - my $pkg = $dbh->selectrow_hashref('SELECT * FROM ' . + my $pkg = $dbh->selectrow_hashref('SELECT *, extract(days from date_trunc(\'days\', now() - state_change)) as state_days FROM ' . table_name() . ' WHERE package = ? AND distribution = ?' . ' FOR UPDATE', undef, $name, $distribution); @@ -2373,9 +2541,25 @@ sub get_source_info { sub get_all_source_info { my %options = @_; - my $q = 'SELECT * FROM ' . table_name() - . ' WHERE distribution = ? '; - my @args = ($distribution); + my $q = "SELECT rel, priority, state_change, permbuildpri, section, buildpri, failed, state, binary_nmu_changelog, bd_problem, version, package, distribution, installed_version, notes, failed_category, builder, old_failed, previous_state, binary_nmu_version, depends, extract(days from date_trunc('days', now() - state_change)) as state_days" +# . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution AND result = 'successful') AS successtime" +# . ", (SELECT max(build_time) FROM ".pkg_history_table_name()." WHERE pkg_history.package = packages.package AND pkg_history.distribution = packages.distribution ) AS anytime" + . " 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 " + . " ) as successtime using (package, distribution) " + . " left join ( " + . "select distinct on (package, distribution) build_time, package, distribution from ".pkg_history_table_name()." order by package, distribution, timestamp desc" + . " ) as anytime using (package, distribution) " + . " WHERE TRUE "; + my @args = (); + if ($distribution) { + my @dists = split(/[, ]+/, $distribution); + $q .= ' AND ( distribution = ? '.(' OR distribution = ? ' x $#dists).' )'; + foreach my $d ( @dists ) { + push @args, ($d); + } + } if ($options{state} && uc($options{state}) ne "ALL") { $q .= ' AND upper(state) = ? '; push @args, uc($options{state}); @@ -2395,12 +2579,12 @@ sub get_all_source_info { } if ($options{list_min_age} > 0) { - $q .= ' AND age(state_change::timestamp) > ? '; + $q .= ' AND age(state_change) > ? '; push @args, $options{list_min_age} . " days"; } if ($options{list_min_age} < 0) { - $q .= ' AND age(state_change::timestamp) < ? '; + $q .= ' AND age(state_change) < ? '; push @args, -$options{list_min_age} . " days"; } @@ -2424,7 +2608,7 @@ sub update_source_info { 'priority = ?, ' . 'installed_version = ?, ' . 'previous_state = ?, ' . - 'state_change = ?, ' . + (($pkg->{'do_state_change'}) ? "state_change = now()," : ""). 'notes = ?, ' . 'builder = ?, ' . 'failed = ?, ' . @@ -2445,7 +2629,6 @@ sub update_source_info { $pkg->{'priority'}, $pkg->{'installed_version'}, $pkg->{'previous_state'}, - $pkg->{'state_change'}, $pkg->{'notes'}, $pkg->{'builder'}, $pkg->{'failed'},