diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2012-01-28 22:25:42 +0000 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2012-01-28 22:25:42 +0000 |
| commit | 485dd783f11097de8e5cd60cd8829d7960ab25b2 (patch) | |
| tree | 813a7fb5d459d704fc6ada26b8be571838923c5b /cmdline | |
| parent | e7a0af555a1a12dce01d0928b0262ec450c34bb0 (diff) | |
| parent | a955c8208d9f037647f7f435ab11ea6690aa5e90 (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 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2f99cd60d..b0a845b4a 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"; |