From: David Kalnischkies <kalnischkies@gmail.com>
Date: Tue, 4 May 2010 17:44:11 +0000 (+0200)
Subject: return in SingleArch a package also for "any"
X-Git-Tag: 0.8.0~9^2~46^2~20
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a101a93299d4a2795edb8495c117eb5095a26e2b

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

diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index ba3c5cbf8..a59a06d65 100644
--- 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) {
-		if (Arch == "native" || Arch == "all" ||
+		if (Arch == "native" || Arch == "all" || Arch == "any" ||
 		    Arch == _config->Find("APT::Architecture"))
 			return SingleArchFindPkg(Name);
 		else
diff --git a/debian/changelog b/debian/changelog
index 482f0860e..9875e0ca2 100644
--- 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
+    - 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: