From: Julian Andres Klode <jak@debian.org>
Date: Tue, 4 May 2010 16:01:51 +0000 (+0200)
Subject: * apt-pkg/pkgcache.cc:
X-Git-Tag: 0.8.0~9^2~55
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/61d15f9104e1f574b0786700207675b892a0e241

* apt-pkg/pkgcache.cc:
  - Merge fix from David to correct handling in single-arch environments.

This makes apt-get showauto working.
---

diff --git a/Makefile b/Makefile
index 664caca41..6cf669ef8 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,7 @@ default: startup all
 all headers library clean veryclean binary program doc dirs:
 	$(MAKE) -C apt-pkg $@
 	$(MAKE) -C apt-inst $@
-	$(MAKE) -C methods $@
 	$(MAKE) -C cmdline $@
-	$(MAKE) -C ftparchive $@
-	$(MAKE) -C dselect $@
-	$(MAKE) -C doc $@
-	$(MAKE) -C po $@
 
 # Some very common aliases
 .PHONY: maintainer-clean dist-clean distclean pristine sanity 
diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc
index 1bbd74bd9..351702240 100644
--- a/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@ -218,7 +218,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 eed15ccb8..28de4dc8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low
       an object which will be set to NULL when the object is deallocated.
   * [ABI break] apt-pkg/acquire{-worker,-item,}.h:
     - subclass pkgAcquire::{Worker,Item,ItemDesc} from WeakPointable.
+  * apt-pkg/pkgcache.cc:
+    - Merge fix from David to correct handling in single-arch environments.
   * cmdline/apt-get.cc:
     - Add apt-get markauto, showauto and unmarkauto commands.