Browse Source

* 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!
tags/debian/0.8.0^2
David Kalnischkies 11 years ago
parent
commit
086bb6d7b5
2 changed files with 7 additions and 2 deletions
  1. +3
    -1
      cmdline/apt-get.cc
  2. +4
    -1
      debian/changelog

+ 3
- 1
cmdline/apt-get.cc View File

@@ -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


+ 4
- 1
debian/changelog View File

@@ -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



Loading…
Cancel
Save