X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=fa138743c779a9fa621b61ff8440661c3ca03043;hb=2f0549583cebcbe896ea5526070bdfeb5e810748;hp=9de97a83d0d1f952b39456fa6baedeff7db1ebb1;hpb=e6eb7a55f3aa9688b97922a86e227876e8c6129e;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index 9de97a8..fa13874 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -284,7 +284,7 @@ if ($distribution eq 'any-unpriv') { } my $schema_suffix = ''; -$recorduser //= (not -t and $user =~ /^buildd_/); +$recorduser //= (not -t and $user//"" =~ /^buildd_/); if (isin( $op_mode, qw(list info)) && $distribution !~ /security/ && !$recorduser && !($privmode)) { $dbh = DBI->connect("DBI:Pg:service=wanna-build") || die "FATAL: Cannot open database: $DBI::errstr\n"; @@ -2676,7 +2676,7 @@ sub call_edos_depcheck { my $change = (defined $interesting_packages{$key} and $pkg->{'state'} eq 'Needs-Build') || (not defined $interesting_packages{$key} and $pkg->{'state'} eq 'BD-Uninstallable'); - my $problemchange = $interesting_packages{$key} ne $pkg->{'bd_problem'}; + my $problemchange = ($interesting_packages{$key}//"") ne ($pkg->{'bd_problem'}//""); if ($change) { if (defined $interesting_packages{$key}) { change_state( \$pkg, 'BD-Uninstallable' ); @@ -3116,7 +3116,7 @@ sub parse_all_v3 { print "$logstr package in unknown state: $pkgs->{'status'}\n"; next SRCS; } - next if $pkgs->{'version'} eq $pkg->{'version'} and $pkgs->{'binnmu'} and $pkgs->{'binnmu'} >= int($pkg->{'binary_nmu_version'}); + next if $pkgs->{'version'} eq $pkg->{'version'} and $pkgs->{'binnmu'}//0 >= int($pkg->{'binary_nmu_version'}//0); next if $pkgs->{'version'} eq $pkg->{'version'} and !isin( $pkg->{'state'}, qw(Installed)); next if isin( $pkg->{'state'}, qw(Not-For-Us Failed-Removed));