use DBI;
use lib '/org/wanna-build/bin';
use lib '/org/wanna-build/lib';
+#use lib 'lib';
use WannaBuild;
use YAML::Tiny;
use Data::Dumper;
}
$pkg->{'package'} = $name;
}
- my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'} ($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}, $pkg->{'state'}):";
+ my $logstr = "merge-v3 $vars->{'time'} ".$name."_$pkgs->{'version'}".
+ ($pkgs->{'binnmu'} ? ";b".$pkgs->{'binnmu'} : "").
+ "($vars->{'arch'}, $vars->{'suite'}, previous: $pkg->{'version'}".
+ ($pkg->{'binary_nmu_version'} ? ";b".$pkg->{'binary_nmu_version'} : "").
+ ", $pkg->{'state'}):";
if (isin($pkgs->{'status'}, qw (installed related)) && $pkg->{'binary_nmu_version'} && $pkgs->{'binnmu'} < $pkg->{'binary_nmu_version'}) {
$pkgs->{'status'} = 'out-of-date';
use strict;
use IO::Uncompress::AnyInflate qw(anyinflate);
use Dpkg::Version qw(vercmp);
+use Data::Dumper;
sub readsourcebins {
my $arch = shift;
while(<$P>) {
my $p;
/^Version:\s*(\S+)$/mi and $p->{'version'} = $1;
+ /^Version:\s*(\S+)\+b([0-9]+)$/mi and $p->{'version'} = $1 and $p->{'binnmu'} = $2;
/^Architecture:\s*(\S+)$/mi and $p->{'arch'} = $1;
/^Package:\s*(\S+)$/mi and $p->{'binary'} = $1;
/^Package:\s*(\S+)$/mi and $p->{'source'} = $1;
/^Source:\s*(\S+)$/mi and $p->{'source'} = $1;
/^Source:\s*(\S+)\s+\((\S+)\)$/mi and $p->{'source'} = $1 and $p->{'version'} = $2;
- $p->{'version'} =~ /(\S+)\+b([0-9]+)/ and $p->{'version'} = $1 and $p->{'binnmu'} = $2;
next unless $p->{'arch'} eq 'all' || $p->{'arch'} eq ${arch};
$binary->{$p->{'binary'}} = { 'version' => $p->{'version'}, 'arch' => $p->{'arch'}} unless $binary->{$p->{'binary'}} and vercmp($binary->{$p->{'binary'}}->{'version'}, $p->{'version'}) < 0;