X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwb-edos-builddebcheck;h=0562a95d3be189c47a308239a15a0dbbaea22f79;hb=2f01a80be910f9a657d13e652b1934bfec07a973;hp=6941fd51f8db56d5236b4eaadf3007e87364d21b;hpb=c28471aec4c7c49225d47f343fe67593a1471b70;p=wannabuild.git

diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck
index 6941fd5..0562a95 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) {
@@ -43,6 +43,8 @@ if ($debug) {
     print "Edos options: $edosoptions\n";
 }
 
+# check that all stanzas in the binary package file have the same
+# architecture.
 $packagearch="";
 open(P,$packagefile);
 while (<P>) {
@@ -71,9 +73,8 @@ if ( $architecture eq "" ) {
     }
 }
 
-open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ".
-     "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ".
-     "| edos-debcheck $edosoptions|");
+open(RESULT,"cat $sourcesfile".
+     "| edos-debcheck $edosoptions '-base FILE' $packagefile |");
 
 $sourcestanza=0;
 $explanation="";
@@ -82,7 +83,8 @@ $binpackage="";
 while (<RESULT>) {
     if (/^\s+/) {
 	if ($sourcestanza) {
-	    s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/o;
+	    s/^(\s*)$sourceprefix(.*)depends on/$1$2build-depends on/o;
+	    s/^(\s*)$sourceprefix(.*) and (.*) conflict/$1$2 build-conflicts with $3/o;
 	    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;