diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-30 19:54:22 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-07-30 19:54:22 +0200 |
| commit | 095aa04a3dc4b9a57f904c8bfbb5980aae11f53b (patch) | |
| tree | caa3350a61b1f771d28060f02029444452ae9a96 | |
| parent | a521ca5d3fc6619529843779ea46500fa6e69e14 (diff) | |
| parent | 4cbf323fabcc44946001a215c224ce5b080519ca (diff) | |
releasing version 0.7.26~exp12ubuntu1
| -rw-r--r-- | apt-pkg/pkgcache.cc | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 7 insertions, 2 deletions
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 5f80dfb0c..d4d4ece09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,10 @@ apt (0.7.26~exp12ubuntu1) maverick; urgency=low - different example sources.list * debian/apt.postinst - drop set_apt_proxy_from_gconf(), no longer needed in maverick + * apt-pkg/pkgcache.cc: + - re-evaluate the architectures cache when the cache is (re)opened - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 12:53:21 +0200 + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 19:32:15 +0200 apt (0.7.26~exp12) experimental; urgency=low |