* apt-pkg/pkgcache.cc:

  - do a string comparision for architecture checking in IsMultiArchImplicit
    as 'unique' strings in the pkgcache aren't unique (Closes: #677454)

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index f694a237e2435c446fef9cd0c413f6868c3b1829..9acb7da72d5ff436fa98a5aeb43913305cfef12f 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -970,7 +970,7 @@ bool pkgCache::PrvIterator::IsMultiArchImplicit() const
 {
    pkgCache::PkgIterator const Owner = OwnerPkg();
    pkgCache::PkgIterator const Parent = ParentPkg();
 {
    pkgCache::PkgIterator const Owner = OwnerPkg();
    pkgCache::PkgIterator const Parent = ParentPkg();

-   if (Owner->Arch != Parent->Arch || Owner->Name == Parent->Name)
+   if (strcmp(Owner.Arch(), Parent.Arch()) != 0 || Owner->Name == Parent->Name)

       return true;
    return false;
 }
       return true;
    return false;
 }

diff --git a/debian/changelog b/debian/changelog
index 69f4778f3591edc5bdcd6c2dcfef02ff0bf5829a..0e08534b661824f0e6205fd296daaa1702d83a53 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ apt (0.9.6.1) UNRELEASED; urgency=low
   * apt-pkg/cacheset.cc:
     - add PackageContainerInterface::FromGroup to support
       architecture specifications with wildcards on the commandline
   * apt-pkg/cacheset.cc:
     - add PackageContainerInterface::FromGroup to support
       architecture specifications with wildcards on the commandline

+  * apt-pkg/pkgcache.cc:
+    - do a string comparision for architecture checking in IsMultiArchImplicit
+      as 'unique' strings in the pkgcache aren't unique (Closes: #677454)

 
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 14 Jun 2012 15:45:13 +0200
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 14 Jun 2012 15:45:13 +0200