* 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!

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index c0e74b37b1601efae83d5540566ab0a8cdd91246..dac0d42a8d2f1a2b47876aa967d100729e008fc2 100644 (file)
--- 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 1207fb52fad270097d5cee9fc112a2e4e6fb8867..0a6a7a8fa4fcd513aa3dac380c84b4b8f5f019d9 100644 (file)
--- 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