$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;
+$list_order = { "failed" => 'fPcpsn', "needs-build" => "CWn" }->{$list_state} if !$list_order and $list_state;
+$list_order ||= 'PScpsn';
$distribution ||= "unstable";
die "Bad distribution '$distribution'\n"
if !isin($distribution, keys %conf::distributions);
}
sub sort_list_func {
- my( $letter, $x, $ax, $bx );
-
- foreach $letter (split( "", $list_order )) {
- SWITCH: foreach ($letter) {
- /C/ && do {
- $x = $b->{'calprio'} <=> $a->{'calprio'};
- return $x if $x != 0;
- last SWITCH;
- };
- /W/ && do {
- $x = $b->{'state_days'} <=> $a->{'state_days'};
- return $x if $x != 0;
- last SWITCH;
- };
- /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}};
}
+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;
P previous state
E in case of Dep-Wait the packages being waited on, in case of Needs-Build the number in the queue
D in case of BD-Uninstallable the reason for the uninstallability
+d distribution
+t time of state change
+
+%{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' => $pkg->{'package'},
- 'a' => $arch,
- 's' => sub { return floor(str2time($pkg->{'state_change'})); },
- 'v' => $pkg->{'version'},
- 'S' => $pkg->{'state'},
- 'u' => $pkg->{'builder'} || "",
- 'X' => sub {
+ '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),
+ '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 .= ":calprio{". $pkg->{'calprio'}."}";
$c .= ":days{". $pkg->{'state_days'}."}";
return $c;
- },
- 'c' => $pkg->{'section'},
- 'P' => $pkg->{'previous_state'} || "unknwon",
- 'E' => sub { return $pkg->{'depends'} if $pkg->{'state'} eq "Dep-Wait";
+ }, $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 ""; },
- 'D' => sub { return "" unless $pkg->{'bd_problem'};
+ return ""; }, $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"; },
+ 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( $distribution, $pkg, $var),
+ 't' => make_fmt( $pkg->{'state_change'}, $pkg, $var),
));
}
projects / wannabuild.git / blobdiff