[debsums] 01/05: compare diversion owner against unqualified package name, too

[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 aac9a6c364852cd15b86ed7acebf0da0dc6d3a85
Author: Andreas Beckmann <anbe at debian.org>
Date:   Thu Jan 12 04:46:05 2017 +0100

    compare diversion owner against unqualified package name, too
    
    Work around dpkg bug #825385: inconsistent arch qualification when
    --admindir points to a foreign arch chroot.
    dpkg may return arch-qualified package names in foreign chroots while
    diversions are 'owned' by an unqualified package.
    Compare the diversion owner against the package name and the (possibly)
    unqualified package name to avoid false positives like
      debsums: missing file /chroot/usr/bin/foo.diverted (from foo:i386 package)
    with
      $pack = foo:i386
      $path = usr/bin/foo
      $diversions{$path} = [ usr/bin/foo.diverted, foo ]
    
    Closes: #688295
---
 debsums | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/debsums b/debsums
index b32b3ba..beed62c 100755
--- a/debsums
+++ b/debsums
@@ -462,7 +462,8 @@ sub resolve_path {
         my ($pack, $path, $sum) = @_;
 
         $path = $diversion{$path}[0] if exists $diversion{$path}
-            and $diversion{$path}[1] ne $pack;
+            and $diversion{$path}[1] ne $pack
+            and $diversion{$path}[1] ne $pack =~ s/:.*//r;
 
         my $resolved = resolve_path($path,$pack);
         if ((!sysopen F, "$root/$resolved", O_RDONLY|O_NONBLOCK|$my_noatime) &&

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