summaryrefslogtreecommitdiff
path: root/cmdline/apt-get.cc
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2012-01-29 13:24:17 +0100
committerDavid Kalnischkies <kalnischkies@gmail.com>2012-01-29 13:24:17 +0100
commit737c7a7b854aa833d75994b67619c5852aa2085d (patch)
treed5ea066f77037fb7718895a87d856c010d80da69 /cmdline/apt-get.cc
parent734a6727696b42d5351f41b5b33ec767ccbd5db6 (diff)
* cmdline/apt-get.cc:
- for cross-build-dependencies M-A: none should be DEB_HOST_ARCH, not DEB_BUILD_ARCH (Closes: #646288)
Diffstat (limited to 'cmdline/apt-get.cc')
-rw-r--r--cmdline/apt-get.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 2d0554e21..32ee46980 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2863,10 +2863,16 @@ bool DoBuildDep(CommandLine &CmdL)
if ((BADVER(Ver)) == false)
{
string forbidden;
- if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All);
+ if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All)
+ {
+ if (colon == string::npos)
+ {
+ Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
+ }
+ }
else if (Ver->MultiArch == pkgCache::Version::Same)
{
- if (colon != string::npos)
+ if (colon == string::npos)
Pkg = Ver.ParentPkg().Group().FindPkg(hostArch);
else if (strcmp(D->Package.c_str() + colon, ":any") == 0)
forbidden = "Multi-Arch: same";