From d9c1637e4a369d386f6d228903953aca2f540585 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Tue, 28 Jul 2009 01:35:17 +0200 Subject: [PATCH] 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. --- bin/wb-edos-builddebcheck | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck index 6941fd5..582912d 100755 --- 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 () { if (/^\s+/) { if ($sourcestanza) { s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/o; + s/>/>/; + s/</) { $explanation .= $_; } } else { + if ($sourcestanza) { + print "\n"; + $sourcestanza=0; + } if ($binpackage ne ""){ $binfailures{$binpackage} = $explanation; $binpackage=""; } - if (/^$sourceprefix.*: FAILED/o) { - s/^$sourceprefix//o; - print; - - $_=; - print; - + if (/^$sourceprefix(.*) \(.*\): FAILED/o) { + print "Package: $1\n"; + print "Failed-Why:\n"; $sourcestanza=1; } elsif (/^([^\s]*) .*: FAILED/) { $binpackage=$1; -- 2.39.5