This is an automated email from the git hooks/post-receive script. abe pushed a commit to branch master in repository debsums.
commit f3e2301d9aa18329e947d6f0aaa873e00cead133 Author: Ryan Niebur <[email protected]> Date: Wed Feb 8 19:25:36 2012 -0800 Support dpkg multiarch from version 1.16.2~wipmultiarch, which has renamed the new PackageSpec field to binary:Package (Closes: #659170, #649156) --- debian/changelog | 8 ++++++++ debsums | 22 +++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59decad..e96284b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +debsums (2.0.51) UNRELEASED; urgency=low + + * Support dpkg multiarch from version 1.16.2~wipmultiarch, which has + renamed the new PackageSpec field to binary:Package (Closes: + #659170, #649156) + + -- Ryan Niebur <[email protected]> Wed, 08 Feb 2012 19:14:22 -0800 + debsums (2.0.50) unstable; urgency=low * add Greek translation, thanks to Georgios M. Zarkadas (Closes: diff --git a/debsums b/debsums index 7201d4f..73b9a79 100755 --- a/debsums +++ b/debsums @@ -240,15 +240,15 @@ my %installed; my %replaced; { for my $fields (parse_dpkg(sub {'dpkg-query', "--admindir=$DPKG", @_, '--show'}, - [qw(Package PackageSpec Version Status Conffiles Replaces)])) { + [qw(Package binary:Package Version Status Conffiles Replaces)])) { my %field = %$fields; - $field{PackageSpec} = $field{Package} if $field{PackageSpec} eq ''; - next unless $field{PackageSpec} ne '' + $field{"binary:Package"} = $field{Package} if $field{"binary:Package"} eq ''; + next unless $field{"binary:Package"} ne '' and $field{Version} ne '' and $field{Status} =~ /\sinstalled$/; - $installed{$field{PackageSpec}}{Version} = $field{Version}; - $installed{$field{PackageSpec}}{Conffiles} = { + $installed{$field{"binary:Package"}}{Version} = $field{Version}; + $installed{$field{"binary:Package"}}{Conffiles} = { map m!^\s*/(\S+)\s+([\da-f]+)!, split /\n/, $field{Conffiles} } if $field{Conffiles}; @@ -257,11 +257,11 @@ my %replaced; my ($pack, $ver) = /^(\S+)(?:\s+\(([^)]+)\))?$/; unless ($pack) { - warn "$self: invalid Replaces for $field{PackageSpec} '$_'\n"; + warn "$self: invalid Replaces for " . $field{"binary:Package"} . " '$_'\n"; next; } - push @{$replaced{$pack}{$ver || 'all'}}, $field{PackageSpec}; + push @{$replaced{$pack}{$ver || 'all'}}, $field{"binary:Package"}; } } } @@ -575,23 +575,23 @@ for (@ARGV) my $deb = $_; my ($fields) = parse_dpkg(sub {'dpkg-deb', @_, '--show', $deb}, - [qw(Package PackageSpec Version Conffiles)]) + [qw(Package binary:Package Version Conffiles)]) or do { warn "$self: $deb does not seem to be a valid debian archive\n"; $status |= 1; next; }; my %field = %$fields; - $field{PackageSpec} = $field{Package} if $field{PackageSpec} eq ''; + $field{"binary:Package"} = $field{Package} if $field{"binary:Package"} eq ''; - unless ($field{PackageSpec} ne '' and $field{Version} ne '') + unless ($field{"binary:Package"} ne '' and $field{Version} ne '') { warn "$self: $deb does not seem to be a valid debian archive\n"; $status |= 1; next; } - $pack = $field{PackageSpec}; + $pack = $field{"binary:Package"}; unless (exists $installed{$pack}) { warn "$self: package $pack is not installed\n"; -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/debsums.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
