summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-01-19 21:32:30 +0100
committerMichael Vogt <michael.vogt@ubuntu.com>2012-01-19 21:32:30 +0100
commita7025171ea8bb49975f98dd4c3c6c7d89335cd30 (patch)
treeb593f0702659a3b3e0389f796beeb825e8da6b85 /cmdline
parent7720666fba9cd7024009bed964ccfa3f2be97c59 (diff)
parent2a2a7ef4dfa9d8fb8118c2e318555438098cdf34 (diff)
merged from lp:~donkult/apt/experimental/
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-get.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ca1169401..85ae1cd7e 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2872,12 +2872,12 @@ bool DoBuildDep(CommandLine &CmdL)
forbidden = "Multi-Arch: same";
// :native gets the buildArch
}
- else if (Ver->MultiArch == pkgCache::Version::Foreign || Ver->MultiArch == pkgCache::Version::AllForeign)
+ else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
{
if (colon != string::npos)
forbidden = "Multi-Arch: foreign";
}
- else if (Ver->MultiArch == pkgCache::Version::Allowed || Ver->MultiArch == pkgCache::Version::AllAllowed)
+ else if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
{
if (colon == string::npos)
Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);