summaryrefslogtreecommitdiff
path: root/apt-pkg/packagemanager.cc
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2012-01-19 18:42:57 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-01-19 18:42:57 +0100
commit2a2a7ef4dfa9d8fb8118c2e318555438098cdf34 (patch)
treeb593f0702659a3b3e0389f796beeb825e8da6b85 /apt-pkg/packagemanager.cc
parent7720666fba9cd7024009bed964ccfa3f2be97c59 (diff)
downloadapt-2a2a7ef4dfa9d8fb8118c2e318555438098cdf34.tar.gz
* apt-pkg/cacheiterators.h:
- return the correct version arch for all+foreign, too The flag is interpreted at a few other places in different styles so this commit ensures that the flag check is consistent everywhere (checking for Same in flag style is a bit too much as it isn't used in combination with others anyway, but who knows and just for consistency)
Diffstat (limited to 'apt-pkg/packagemanager.cc')
-rw-r--r--apt-pkg/packagemanager.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index c9d7a3024..349adbe40 100644
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -733,7 +733,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
- if (Immediate == true && instVer->MultiArch == pkgCache::Version::Same)
+ if (Immediate == true && (instVer->MultiArch & pkgCache::Version::Same) == pkgCache::Version::Same)
{
/* Do lockstep M-A:same unpacking in two phases:
First unpack all installed architectures, then the not installed.