Bläddra i källkod

* 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 14 år sedan
förälder
incheckning
ef5dc12ccb
2 ändrade filer med 4 tillägg och 1 borttagningar
  1. 1 1
      apt-pkg/pkgcache.cc
  2. 3 0
      debian/changelog

+ 1 - 1
apt-pkg/pkgcache.cc

@@ -970,7 +970,7 @@ bool pkgCache::PrvIterator::IsMultiArchImplicit() const
 {
 {
    pkgCache::PkgIterator const Owner = OwnerPkg();
    pkgCache::PkgIterator const Owner = OwnerPkg();
    pkgCache::PkgIterator const Parent = ParentPkg();
    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 true;
    return false;
    return false;
 }
 }

+ 3 - 0
debian/changelog

@@ -14,6 +14,9 @@ apt (0.9.6.1) UNRELEASED; urgency=low
   * apt-pkg/cacheset.cc:
   * apt-pkg/cacheset.cc:
     - add PackageContainerInterface::FromGroup to support
     - add PackageContainerInterface::FromGroup to support
       architecture specifications with wildcards on the commandline
       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