summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorColin Watson <cjwatson@canonical.com>2012-11-20 18:16:30 +0000
committerColin Watson <cjwatson@canonical.com>2012-11-20 18:16:30 +0000
commit739aa5d108aaee7864cc204704341cd8258fc4f1 (patch)
tree9a276f919575ab71369ec572e6a3e71415d2fc00 /cmdline/apt-get.cc
parent4a53b1eb164f05984812052b85c07e223e311aa2 (diff)
Fix mismerge of cross-build-dependency handling patch from
0.8.16~exp12ubuntu7.
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index ede5ed6d3..54408329a 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2943,7 +2943,7 @@ bool DoBuildDep(CommandLine &CmdL)
for (; Ver != verlist.end(); ++Ver)
{
forbidden.clear();
- if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
+ if (Ver->MultiArch == pkgCache::Version::None)
{
if (colon == string::npos)
Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);