return in SingleArch a package also for "any"

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index ba3c5cbf8b54fa6f9418e6db692c90a6ba4ea1e3..a59a06d65411375cad6ceebeea33bc08290d2d9f 100644 (file)
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -221,7 +221,7 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {
 /* Returns 0 on error, pointer to the package otherwise */
 pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string const &Arch) {
        if (MultiArchCache() == false) {
 /* Returns 0 on error, pointer to the package otherwise */
 pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string const &Arch) {
        if (MultiArchCache() == false) {

-               if (Arch == "native" || Arch == "all" ||
+               if (Arch == "native" || Arch == "all" || Arch == "any" ||

                    Arch == _config->Find("APT::Architecture"))
                        return SingleArchFindPkg(Name);
                else
                    Arch == _config->Find("APT::Architecture"))
                        return SingleArchFindPkg(Name);
                else

diff --git a/debian/changelog b/debian/changelog
index 482f0860eb9814bd492f4085d774b6da45dd293c..9875e0ca279ce0e72e0432719da2bbc1779e29fe 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ apt (0.7.26~exp4) UNRELEASED; urgency=low
   * apt-pkg/depcache.cc:
     - rewrite the pseudo package reinstaller to be more intelligent
       in his package choices
   * apt-pkg/depcache.cc:
     - rewrite the pseudo package reinstaller to be more intelligent
       in his package choices

+    - return in SingleArch a package also for "any"

   * apt-pkg/packagemanager.cc:
     - don't try to "unpack" pseudo packages twice
   * apt-pkg/contrib/fileutl.cc:
   * apt-pkg/packagemanager.cc:
     - don't try to "unpack" pseudo packages twice
   * apt-pkg/contrib/fileutl.cc: