X-Git-Url: https://git.donarmstrong.com/?p=wannabuild.git;a=blobdiff_plain;f=bin%2Fwb-graph;h=743c1af29a76a7885fe3d9e065f91bdd2a021b0b;hp=2a952d004b2374ef05cbc525c459917cf5d8e1a9;hb=e0bd52fb8cf3c44ecd1e425d20613219b04963d6;hpb=927c694fa27e6648d8d0770c5e29a66c7ec306c3 diff --git a/bin/wb-graph b/bin/wb-graph index 2a952d0..743c1af 100755 --- a/bin/wb-graph +++ b/bin/wb-graph @@ -42,10 +42,10 @@ foreach $arch (@archs) { my($lastmsg, %n_state, $total, %n_builder, $pu_total); $pu_total = 0; -$n_state{"Installed"} = 0; -open( PIPE, "wanna-build --database=$arch/build-db --dist=$dist --list=all |" ) +$n_state{"Installed"} = 0; +open( my $pipe, '-|', "wanna-build -A $arch --dist=$dist --list=all" ) or die "Cannot spawn wanna-build: $!\n"; -while( ) { +while( <$pipe> ) { if (/^Database for $dist doesn't exist$/) { last; } @@ -64,11 +64,12 @@ while( ) { } $lastmsg = $_; } -close( PIPE ); +close( $pipe ); if ($?) { print ", 0, 0"; } else { # $total -= $n_state{"Not-For-Us"}; + $total -= $n_state{"Auto-Not-For-Us"}; if ( $previously_built ) { print ", ".$n_state{"Installed"}.", ".$pu_total; } else {