X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=bin%2Fwanna-build;h=636cdaecca1c7749ca9309007c6f17b621c08271;hb=d38cebee71c4d472d45c09c580c064ae52e12f47;hp=a0904283288e6c1f9db3bf4427eb57c74a2492a7;hpb=43c14620e569a6923bbf360cef7f53754505a245;p=wannabuild.git diff --git a/bin/wanna-build b/bin/wanna-build index a090428..636cdae 100755 --- a/bin/wanna-build +++ b/bin/wanna-build @@ -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' ); @@ -3054,7 +3054,7 @@ sub parse_all_v3 { ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : ""). ", $pkg->{'state'}):"; - if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && $pkgs->{'binnmu'} && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < int($pkg->{'binary_nmu_version'})) { + if (isin($pkgs->{'status'}, qw (installed related)) && $pkgs->{'version'} eq $pkg->{'version'} && $pkgs->{'binnmu'}//0 < int($pkg->{'binary_nmu_version'}//0)) { $pkgs->{'status'} = 'out-of-date'; } if (isin($pkgs->{'status'}, qw (installed related))) { @@ -3068,7 +3068,7 @@ sub parse_all_v3 { } my $attrs = { 'version' => 'version', 'installed_version' => 'version', 'binary_nmu_version' => 'binnmu', 'section' => 'section', 'priority' => 'priority' }; foreach my $k (keys %$attrs) { - if (!$pkg->{$k} or !$pkgs->{$attrs->{$k}} or $pkg->{$k} ne $pkgs->{$attrs->{$k}}) { + if (($pkg->{$k}//"") ne ($pkgs->{$attrs->{$k}}//"")) { $pkg->{$k} = $pkgs->{$attrs->{$k}}; $change++; } @@ -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));