Adjust wb-edos-builddebcheck output

For easier parsing, we expect a control-like format with two fields,
Package and Failed-Why, listing only source package names that fail.

diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck
index 6941fd51f8db56d5236b4eaadf3007e87364d21b..582912de918bfbd621bbd283c0b45078359c44c9 100755 (executable)
--- a/bin/wb-edos-builddebcheck
+++ b/bin/wb-edos-builddebcheck
@@ -12,7 +12,7 @@ $sourceprefix="source---";
 
 $architecture="";
 $binexplain=0;
-$edosoptions = "-failures -explain";
+$edosoptions = "-failures -explain -quiet";
 while ( $arg = shift @ARGV ) {
     if ( $arg eq '-a' || $arg eq '--architecture' ) {
        if ($#ARGV == -1) {
@@ -83,6 +83,8 @@ while (<RESULT>) {
     if (/^\s+/) {
        if ($sourcestanza) {
            s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/o;
+           s/&gt;/>/;
+           s/&lt;/</;
            print;
            if (/depends on ([^\s]*) .*\{.*\}/) {
                push(@binqueue,$1);
@@ -91,17 +93,17 @@ while (<RESULT>) {
            $explanation .= $_;
        }
     } else {
+       if ($sourcestanza) {
+           print "\n";
+           $sourcestanza=0;
+       }
        if ($binpackage ne ""){
            $binfailures{$binpackage} = $explanation;
            $binpackage="";
        }
-       if (/^$sourceprefix.*: FAILED/o) {
-           s/^$sourceprefix//o;
-           print;
-           
-           $_=<RESULT>;
-           print;
-           
+       if (/^$sourceprefix(.*) \(.*\): FAILED/o) {
+           print "Package: $1\n";
+           print "Failed-Why:\n";
            $sourcestanza=1;
        } elsif (/^([^\s]*) .*: FAILED/) {
            $binpackage=$1;