From 4cbf323fabcc44946001a215c224ce5b080519ca Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 30 Jul 2010 17:40:01 +0200 Subject: * apt-pkg/pkgcache.cc: - re-evaluate the architectures cache when the cache is (re)opened --- apt-pkg/pkgcache.cc | 5 ++++- debian/changelog | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apt-pkg/pkgcache.cc b/apt-pkg/pkgcache.cc index 9e1f8b633..ae11057ed 100644 --- a/apt-pkg/pkgcache.cc +++ b/apt-pkg/pkgcache.cc @@ -111,7 +111,10 @@ bool pkgCache::Header::CheckSizes(Header &Against) const /* */ pkgCache::pkgCache(MMap *Map, bool DoMap) : Map(*Map) { - MultiArchEnabled = APT::Configuration::getArchitectures().size() > 1; + // call getArchitectures() with cached=false to ensure that the + // architectures cache is re-evaulated. this is needed in cases + // when the APT::Architecture field changes between two cache creations + MultiArchEnabled = APT::Configuration::getArchitectures(false).size() > 1; if (DoMap == true) ReMap(); } diff --git a/debian/changelog b/debian/changelog index 33bd66b1c..cd0f4d7f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.26~exp13) UNRELEASEDexperimental; urgency=low + + [ Michael Vogt ] + * apt-pkg/pkgcache.cc: + - re-evaluate the architectures cache when the cache is (re)opened + + -- Michael Vogt Fri, 30 Jul 2010 17:37:14 +0200 + apt (0.7.26~exp12) experimental; urgency=low [ Michael Vogt ] -- cgit v1.2.3