X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwb-graph;h=24870d09a9f60f3a9009a3fb3dd3bf4d5239b435;hb=7385765ef4c28872df38bfc3dd762ed1dc3b1a3a;hp=b5dce42ed7e18937437c39416dea149db44e61b4;hpb=7b09fee8d7503ca518f28e9ba12951848524c652;p=wannabuild.git diff --git a/bin/wb-graph b/bin/wb-graph index b5dce42..24870d0 100755 --- a/bin/wb-graph +++ b/bin/wb-graph @@ -5,7 +5,7 @@ use strict; use vars qw($dist); my $previously_built; -$dist = "unstable"; +$dist = "sid"; while( @ARGV && $ARGV[0] =~ /^-/ ) { $_ = shift @ARGV; @@ -19,11 +19,6 @@ while( @ARGV && $ARGV[0] =~ /^-/ ) { else { $dist = shift @ARGV; } - $dist = "oldstable" if $dist eq "o"; - $dist = "stable" if $dist eq "s"; - $dist = "tesing" if $dist eq "t"; - $dist = "unstable" if $dist eq "u"; - die "Bad distribution\n" if !isin($dist, qw(oldstable stable testing unstable)); } elsif (/^--$/) { last; @@ -40,17 +35,16 @@ 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 $arch; +. /org/wanna-build/triggers/common -foreach $arch (@archs) { +for arch in $ARCHS_unstable; do 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 2>&1 |" ) +open( my $pipe, '-|', "wanna-build --database=$arch/build-db --dist=$dist --list=all" ) or die "Cannot spawn wanna-build: $!\n"; -while( ) { +while( <$pipe> ) { if (/^Database for $dist doesn't exist$/) { last; } @@ -69,7 +63,7 @@ while( ) { } $lastmsg = $_; } -close( PIPE ); +close( $pipe ); if ($?) { print ", 0, 0"; } else { @@ -80,7 +74,7 @@ if ($?) { print ", ".$n_state{"Installed"}.", ".$total; } } -} +done print "\n"; exit 0;