X-Git-Url: https://git.donarmstrong.com/?p=wannabuild.git;a=blobdiff_plain;f=bin%2Fwb-graph;h=78d3c29964781e1db8f5bc713eff8d59d3b52b59;hp=2a952d004b2374ef05cbc525c459917cf5d8e1a9;hb=858b5f8f253cb50552d45d22f20cba5179ca5a68;hpb=bf263c8438b11ee7acb1308cf96bfca49ff2781f diff --git a/bin/wb-graph b/bin/wb-graph index 2a952d0..78d3c29 100755 --- a/bin/wb-graph +++ b/bin/wb-graph @@ -35,17 +35,17 @@ my $date=`date -u "+%m/%d/%Y %T"`; chop($date); print "$date"; -my @archs = qw(alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 amd64 sparc armel kfreebsd-amd64 kfreebsd-i386); +my @archs = qw(alpha arm hppa hurd-i386 i386 ia64 m68k mips mipsel powerpc s390 amd64 sparc armel kfreebsd-amd64 kfreebsd-i386 armhf s390x); my $arch; 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 {