merge single-arch :arch fix from my sid branch

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index c6326abf12fb2d98b67d4e73a3b5433668e2c52d..93d09a18ead569cd1ed271097bbb2fff76fa4a70 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -211,11 +211,14 @@ pkgCache::PkgIterator pkgCache::SingleArchFindPkg(const string &Name)
 // ---------------------------------------------------------------------
 /* Returns 0 on error, pointer to the package otherwise */
 pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {
 // ---------------------------------------------------------------------
 /* Returns 0 on error, pointer to the package otherwise */
 pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {

-       if (MultiArchCache() == false)
-               return SingleArchFindPkg(Name);

        size_t const found = Name.find(':');
        if (found == string::npos)
        size_t const found = Name.find(':');
        if (found == string::npos)

-               return FindPkg(Name, "native");
+       {
+               if (MultiArchCache() == false)
+                       return SingleArchFindPkg(Name);
+               else
+                       return FindPkg(Name, "native");
+       }

        string const Arch = Name.substr(found+1);
        if (Arch == "any")
                return FindPkg(Name, "any");
        string const Arch = Name.substr(found+1);
        if (Arch == "any")
                return FindPkg(Name, "any");