Merge branch 'edos-debcheck' of git://git.debian.org/users/nomeata/wanna-build into...

[wannabuild.git] / bin / wb-edos-builddebcheck

diff --git a/bin/wb-edos-builddebcheck b/bin/wb-edos-builddebcheck
index 6941fd51f8db56d5236b4eaadf3007e87364d21b..b8a241169a1f8477adae0e2168dd5b9b43d12b43 100755 (executable)
--- a/bin/wb-edos-builddebcheck
+++ b/bin/wb-edos-builddebcheck
@@ -71,7 +71,7 @@ if ( $architecture eq "" ) {
     }
 }
 
-open(RESULT,"python /usr/share/edos-distcheck/add-sources.py ".
+open(RESULT,"add-sources.py ".
      "--prefix \"$sourceprefix\" < $packagefile $sourcesfile $architecture ".
      "| edos-debcheck $edosoptions|");
 
@@ -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;