X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=e16cdcc4c30c0a7597ce5bef27a1e98beafaa7f3;hb=fe779daa9a08b6e39b3e8ad6ae2a3f4b8e8179b1;hp=3ce374f68da2ea271193796f271ec10a1e83f1d6;hpb=225bc59dd7c597d8a1e35d54fc15ed73a2b5b1e8;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index 3ce374f..e16cdcc 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -67,6 +67,7 @@ our $Pas = '/org/buildd.debian.org/etc/packages-arch-specific/Packages-arch-spec our $simulate = 0; our $simulate_edos = 0; our $api = undef; # allow buildds to specify an different api +our $recorduser = undef; # global vars $ENV{'PATH'} = "/bin:/usr/bin:/usr/local/bin:/org/wanna-build/bin/"; @@ -371,7 +372,8 @@ END { } my $schema_suffix = ''; -if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !(not -t and $user =~ /buildd-/) && !($privmode eq 'yes')) { +$recorduser //= (not -t and $user =~ /^buildd_/); +if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode eq 'yes')) { $dbh = DBI->connect("DBI:Pg:service=wanna-build") || die "FATAL: Cannot open database: $DBI::errstr\n"; $schema_suffix = '_public'; @@ -549,7 +551,7 @@ sub process { die "Unexpected operation mode $op_mode\n"; } - if (not -t and $user =~ /buildd-/) { + if ($recorduser) { my $userinfo = get_user_info($user); if (!defined $userinfo) { @@ -2982,7 +2984,7 @@ sub parse_all_v3() { ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : ""). ", $pkg->{'state'}):"; - if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) { + if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) { $pkgs->{'status'} = 'out-of-date'; } if (isin($pkgs->{'status'}, qw (installed related))) {