* 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 664caca41f2d9d67a63f1aeb4f170b9b3c00f4b5..6cf669ef83c730a7d80e53cfbffd3306039da0f1 100644 (file)
--- 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 1bbd74bd9815fc197e67a7c78bf3994c92bebf80..351702240bec85418f5025f2a42758811d54a8d8 100644 (file)
--- 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 eed15ccb87761a3dd1799c1adcb6937a6374eebc..28de4dc8aa479d0407d179225e1aed7deb290c08 100644 (file)
--- 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.