Allow the use of --list bd-uninstallable

[wannabuild.git] / bin / wanna-build

diff --git a/bin/wanna-build b/bin/wanna-build
index d08da9386f3d967e46ca2b8d394f4fe52914d1c3..adeaf887e6fb402c67bd82a3750c85edad14ad70 100755 (executable)
--- a/bin/wanna-build
+++ b/bin/wanna-build
@@ -138,7 +138,7 @@ my %options =
                           if !isin( $list_state, qw(needs-build building uploaded
                                                 built build-attempted failed installed dep-wait
                                                 not-for-us all failed-removed
-                                                install-wait reupload-wait));} },
+                                                install-wait reupload-wait bd-uninstallable));} },
         # options with args
         dist           =>
         { short => "d", arg => \$distribution,
@@ -188,7 +188,7 @@ my %options =
         export         => { arg => \$export_to, mode => "export" },
         "lock-for"     => { arg => \$lock_for_pid, mode => "lock-for" },
         "unlock-for"   => { arg => \$lock_for_pid, mode => "unlock-for" },
-        "act-on-behalve-of" => { arg => \$lock_for_pid },
+        "act-on-behalf-of" => { arg => \$lock_for_pid },
         "start-transaction" => { mode => "start-transaction" },
         "commit-transaction" => { mode => "commit-transaction" },
         "transactional" => { flag => \$transactional },
@@ -2583,37 +2583,38 @@ sub call_edos_depcheck {
     #print "I would look at these sources with edos-depcheck:\n";
     #print join " ", keys %interesting_packages,"\n";
 
-    open(EDOS,"-|","wb-edos-builddebcheck", "-a", $arch, $packagesfile, $sourcesfile)
-       or die "Failed to run wb-edos-builddebcheck: $!\n";
-
-    local($/) = ""; # read in paragraph mode
-    while( <EDOS> ) {
-           my( $key, $reason ) ;
-           s/\s*$//m;
-           /^Package:\s*(\S+)$/mi and $key = $1;
-           /^Failed-Why:(([^\n]|\n ([^\n]|\.))*)$/msi and $reason = $1;
-           $reason =~ s/^\s*//mg;
+    if (open(EDOS,"-|","wb-edos-builddebcheck", "-a", $arch, $packagesfile, $sourcesfile)) {
+       local($/) = ""; # read in paragraph mode
+       while( <EDOS> ) {
+               my( $key, $reason ) ;
+               s/\s*$//m;
+               /^Package:\s*(\S+)$/mi and $key = $1;
+               /^Failed-Why:(([^\n]|\n ([^\n]|\.))*)$/msi and $reason = $1;
+               $reason =~ s/^\s*//mg;
+               $reason ||= 'No reason given by edos-debcheck';
 
-           if (exists $interesting_packages{$key}) {
-               $interesting_packages{$key} = $reason;
-           } else {
-               print "TODO: edos reported a package we do not care about now" if $verbose;
-           }
+               if (exists $interesting_packages{$key}) {
+                   $interesting_packages{$key} = $reason;
+               } else {
+                   #print "TODO: edos reported a package we do not care about now\n" if $verbose;
+               }
+       }
+       close EDOS;
+    } else {
+       print "ERROR: Could not run wb-edos-builddebcheck. I am continuing, assuming\n" .
+             "all packages have installable build-dependencies."
     }
-    close EDOS;
 
     for my $key (keys %interesting_packages) {
        my $pkg = $db{$key};
        my $change = 
-           (defined $interesting_packages{$key} && $pkg->{'State'} eq 'Needs-Build') ||
-           (not defined $interesting_packages{$key} && $pkg->{'State'} eq 'BD-Uninstallable');
+           (defined $interesting_packages{$key} and $pkg->{'State'} eq 'Needs-Build') ||
+           (not defined $interesting_packages{$key} and $pkg->{'State'} eq 'BD-Uninstallable');
        if ($change) {
            if (defined $interesting_packages{$key}) {
-                   $pkg->{'State'} = 'BD-Uninstallable';
-                   $pkg->{'Reason'} = $interesting_packages{$key};
                    change_state( \$pkg, 'BD-Uninstallable' );
+                   $pkg->{'Reason'} = $interesting_packages{$key};
            } else {
-                   $pkg->{'State'} = 'Needs-Build';
                    change_state( \$pkg, 'Needs-Build' );
            }
            log_ta( $pkg, "--merge-all" );
@@ -2667,7 +2668,7 @@ Options:
     --export FILE: Export database to a ASCII file FILE
     --lock-for PID: Locks the database for the process with this pid
     --unlock-for PID: Unlocks the database for the process with this pid
-    --act-on-behalve-of PID: Ignores the log (if it is held by this pid)
+    --act-on-behalf-of PID: Ignores the log (if it is held by this pid)
     --start-transaction: Creates a copy of the state of the database, for
        use with --transactional. This overrides any previous uncommited
        transaction. Should only be used after --lock-for