diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-01-28 21:58:28 +0000 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-01-28 21:58:28 +0000 |
| commit | a955c8208d9f037647f7f435ab11ea6690aa5e90 (patch) | |
| tree | fdbc769c9d0b1275a96eb395c738f410fc858132 /cmdline | |
| parent | 765019f72bad10bbb48bf01d473bbccbbb892361 (diff) | |
Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH.
Closes: #646288.
Diffstat (limited to 'cmdline')
| -rw-r--r-- | cmdline/apt-get.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 45459de43..32ee46980 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2863,7 +2863,13 @@ 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) |