X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwb-edos-builddebcheck;h=0562a95d3be189c47a308239a15a0dbbaea22f79;hb=aaf62bbb2d408fbd9a92e9f767c55752b5b9cb5d;hp=b8a241169a1f8477adae0e2168dd5b9b43d12b43;hpb=510abd51d1679fb6f863fb0e196b2c12846548b2;p=wannabuild.git

diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck
index b8a2411..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,"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,9 +83,8 @@ $binpackage="";
 while (<RESULT>) {
     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);
@@ -93,7 +93,7 @@ while (<RESULT>) {
 	    $explanation .= $_;
 	}
     } else {
-    	if ($sourcestanza) {
+	if ($sourcestanza) {
 	    print "\n";
 	    $sourcestanza=0;
 	}