Merge branch 'master' of /org/buildd.debian.org/git/wanna-build

diff --git a/bin/wanna-build b/bin/wanna-build
index cd77851dd3520322fad9410cf71c4ad549f4d555..d5813c063db69f72928a9c6bc5194f083403d4f8 100755 (executable)
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -1857,6 +1857,90 @@ sub calculate_prio {
 }
 
 
+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
+
+p Package name
+a Architecture
+s Time in this state in full seconds since epoch
+v Package version
+S Package state
+u Builder (e.g. buildd_mipsel-rem)
+X the string normally between [], e.g. optional:out-of-date:calprio{61}:days{25}
+c section (e.g. libs or utils)
+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
+
+%{Text}?  print text in case ? is not empty, don't print ?
+%{!Text}? print text in case ? is empty, don't print ?
+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),
+        '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),
+        '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),
+    ));
+}
+
 sub list_packages {
        my $state = shift;
        my( $name, $pkg, @list );
@@ -1872,31 +1956,7 @@ sub list_packages {
 
        foreach $pkg (sort sort_list_func @list) {
                 if ($printformat) {
-                    print stringf($printformat, (
-                        'p' => $pkg->{'package'},
-                        'a' => $arch,
-                        's' => sub { return floor(str2time($pkg->{'state_change'})); },
-                        'v' => $pkg->{'version'},
-                        'S' => $pkg->{'state'},
-                        'u' => $pkg->{'builder'} || "",
-                        'X' => 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;
-                            },
-                        'c' => $pkg->{'section'},
-                        'P' => $pkg->{'previous_state'} || "unknwon",
-                        'E' => sub { return $pkg->{'depends'} if $pkg->{'state'} eq "Dep-Wait";
-                            return $scnt{'Needs-Build'} + 1 if $pkg->{'state'} eq 'Needs-Build';
-                            return ""; },
-                        'D' => sub { return "" unless $pkg->{'bd_problem'};
-                            return $pkg->{'package'}."#".$arch."-bd-problem\n".
-                            join("\\0a",split("\n",$pkg->{'bd_problem'}))."\\0a\n"; },
-                    ))."\n";
+                    print print_format($printformat, $pkg, {'cnt' => $cnt, 'scnt' => \%scnt})."\n";
                    ++$cnt;
                    $scnt{$pkg->{'state'}}++;
                     next;