From 765019f72bad10bbb48bf01d473bbccbbb892361 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 28 Jan 2012 20:27:11 +0000 Subject: fix an inverted check on build-deps: we were accidentally checking for host-arch packages whenever the build-dep *did* include a colon, instead of when it didn't. --- cmdline/apt-get.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmdline/apt-get.cc') diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 2d0554e21..45459de43 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2866,7 +2866,7 @@ bool DoBuildDep(CommandLine &CmdL) if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All); 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"; -- cgit v1.2.3 From a955c8208d9f037647f7f435ab11ea6690aa5e90 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sat, 28 Jan 2012 21:58:28 +0000 Subject: Multi-Arch: none build-deps should be DEB_HOST_ARCH, not DEB_BUILD_ARCH. Closes: #646288. --- cmdline/apt-get.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'cmdline/apt-get.cc') 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) -- cgit v1.2.3