summaryrefslogtreecommitdiff
path: root/cmdline
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-08-12 13:51:31 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-08-12 13:51:31 +0200
commite4fa1bca08e6a1df1b6101a1c096f44879b4575e (patch)
treeb1b145cd3c2448452045e487c64d940c4854e3bc /cmdline
parent22041bd2864b8d0b401b45dde9eda4003a11fec4 (diff)
parent086bb6d7b5ba933e0a8a6de13d731fcfb8eeda74 (diff)
* Swedish translation update. Closes: #592366
* merge of the debian-expermental-ma branch * refresh po/pot files in doc/ and po/ * 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! * Swedish translation update. Closes: #592366
Diffstat (limited to 'cmdline')
-rw-r--r--cmdline/apt-get.cc4
1 files changed, 3 insertions, 1 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