X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwb-edos-builddebcheck;h=400d1e3d9b7dfea47b8e1c700b6be408fccdbd04;hb=d60797ad26cad0923ca3ac1288dfa369a5bb8398;hp=0cec41ceae960ee882ff61420803b80d2be2d953;hpb=2ac5454880b42ac90db3bca61fc04fd82c993987;p=wannabuild.git

diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck
index 0cec41c..400d1e3 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,7 +73,7 @@ if ( $architecture eq "" ) {
     }
 }
 
-open(RESULT,"add-sources.py ".
+open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ".
      "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ".
      "| edos-debcheck $edosoptions|");
 
@@ -80,13 +82,10 @@ $explanation="";
 $binpackage="";
 
 while (<RESULT>) {
-    if (/^The following constraints cannot be satisfied:/) {
-    	next
-    } elsif (/^\s+/) {
+    if (/^\s+/) {
 	if ($sourcestanza) {
-	    s/^(\s*)$sourceprefix(.*)(depends on|conflicts with)/$1$2build-$3/o;
-	    s/&gt;/>/;
-	    s/&lt;/</;
+	    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);
@@ -95,7 +94,7 @@ while (<RESULT>) {
 	    $explanation .= $_;
 	}
     } else {
-    	if ($sourcestanza) {
+	if ($sourcestanza) {
 	    print "\n";
 	    $sourcestanza=0;
 	}