[debsums] 149/184: Allow Multi-Arch: same packages to be specified to debsums without the : suffix by using a mapping for fallback package names (Closes: #673174)

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository debsums.

commit 23f2a2cde956acde324356ad1f5760d2f33a4c85
Author: Ryan Niebur <ryanryan52 at gmail.com>
Date:   Mon Jun 18 17:02:10 2012 -0700

    Allow Multi-Arch: same packages to be specified to debsums without the : suffix by using a mapping for fallback package names (Closes: #673174)
---
 debian/changelog |  5 ++++-
 debsums          | 27 +++++++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40460e2..06c91aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,11 @@ debsums (2.0.52) UNRELEASED; urgency=low
   * Remove the obsolete 90debsums apt configuration file on install and
     make the keep option to generate md5sums file using debsums a noop
     - Add dependency on dpkg version 1.16.3, which generates md5sums
+  * Allow Multi-Arch: same packages to be specified to debsums without
+    the : suffix by using a mapping for fallback package names (Closes:
+    #673174)
 
- -- Ryan Niebur <ryan at debian.org>  Mon, 18 Jun 2012 16:53:09 -0700
+ -- Ryan Niebur <ryan at debian.org>  Mon, 18 Jun 2012 17:02:03 -0700
 
 debsums (2.0.51) unstable; urgency=low
 
diff --git a/debsums b/debsums
index fdde1d9..6603362 100755
--- a/debsums
+++ b/debsums
@@ -248,6 +248,9 @@ my %replaced;
 		and $field{Status} =~ /\sinstalled$/;
 
 	$installed{$field{"binary:Package"}}{Version} = $field{Version};
+	if($field{"binary:Package"} ne $field{"Package"} && $field{"binary:Package"} eq ($field{"Package"} . ":" . $arch)) {
+	    $package_name{$field{"Package"}} = $field{"binary:Package"};
+	}
 	$installed{$field{"binary:Package"}}{Conffiles} = {
 	    map m!^\s*/(\S+)\s+([\da-f]+)!, split /\n/, $field{Conffiles}
 	} if $field{Conffiles};
@@ -489,9 +492,15 @@ for (@ARGV)
 	$pack = $_;
 	unless (exists $installed{$pack})
 	{
-	    warn "$self: package $pack is not installed\n";
-	    $status |= 1;
-	    next;
+	    if(exists $package_name{$pack}) {
+		$pack = $package_name{$pack};
+	    }
+	    unless (exists $installed{$pack})
+	    {
+		warn "$self: package $pack is not installed\n";
+		$status |= 1;
+		next;
+	    }
 	}
 
 	my $deb;
@@ -595,9 +604,15 @@ for (@ARGV)
 	$pack = $field{"binary:Package"};
 	unless (exists $installed{$pack})
 	{
-	    warn "$self: package $pack is not installed\n";
-	    $status |= 1;
-	    next;
+	    if(exists $package_name{$pack}) {
+		$pack = $package_name{$pack};
+	    }
+	    unless (exists $installed{$pack})
+	    {
+		warn "$self: package $pack is not installed\n";
+		$status |= 1;
+		next;
+	    }
 	}
 
 	unless ($installed{$pack}{Version} eq $field{Version})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/debsums.git