diff options
| author | Julian Andres Klode <jak@debian.org> | 2010-05-04 18:01:51 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2010-05-04 18:01:51 +0200 |
| commit | 61d15f9104e1f574b0786700207675b892a0e241 (patch) | |
| tree | 613c784b2e33d7c8ce27314838c71eb5d4748356 | |
| parent | d63a1458427692a6f98274e76020e0f803408d81 (diff) | |
* apt-pkg/pkgcache.cc:
- Merge fix from David to correct handling in single-arch environments.
This makes apt-get showauto working.
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | apt-pkg/pkgcache.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 |
3 files changed, 3 insertions, 6 deletions
@@ -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. |