diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-11 19:39:44 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2010-08-11 19:39:44 +0200 |
| commit | 086bb6d7b5ba933e0a8a6de13d731fcfb8eeda74 (patch) | |
| tree | b1b145cd3c2448452045e487c64d940c4854e3bc | |
| parent | b472c6b08e0bfd1ea94390cd525cef579ea3ccee (diff) | |
* cmdline/apt-get.cc:
- let APT::Get::Arch-Only in build-dep default to false again
(Closes: #592628) Thanks Mohamed Amine IL Idrissi for report!
| -rw-r--r-- | cmdline/apt-get.cc | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index c0e74b37b..dac0d42a8 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -28,6 +28,7 @@ #define _LARGEFILE_SOURCE #define _LARGEFILE64_SOURCE +#include <apt-pkg/aptconfiguration.h> #include <apt-pkg/error.h> #include <apt-pkg/cmndline.h> #include <apt-pkg/init.h> @@ -2493,6 +2494,7 @@ bool DoBuildDep(CommandLine &CmdL) return false; unsigned J = 0; + bool const StripMultiArch = APT::Configuration::getArchitectures().size() <= 1; for (const char **I = CmdL.FileList + 1; *I != 0; I++, J++) { string Src; @@ -2502,7 +2504,7 @@ bool DoBuildDep(CommandLine &CmdL) // Process the build-dependencies vector<pkgSrcRecords::Parser::BuildDepRec> BuildDeps; - if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only",true)) == false) + if (Last->BuildDepends(BuildDeps, _config->FindB("APT::Get::Arch-Only", false), StripMultiArch) == false) return _error->Error(_("Unable to get build-dependency information for %s"),Src.c_str()); // Also ensure that build-essential packages are present diff --git a/debian/changelog b/debian/changelog index 1207fb52f..0a6a7a8fa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,8 +29,11 @@ apt (0.8.0~pre1) UNRELASED; urgency=low * apt-pkg/algorithms.cc: - change the debug outputs to display also arch of the package and version dependencies information + * cmdline/apt-get.cc: + - let APT::Get::Arch-Only in build-dep default to false again + (Closes: #592628) Thanks Mohamed Amine IL Idrissi for report! - -- David Kalnischkies <kalnischkies@gmail.com> Tue, 10 Aug 2010 15:56:11 +0200 + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 11 Aug 2010 19:36:21 +0200 apt (0.7.26~exp12) experimental; urgency=low |