diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2012-06-10 13:06:11 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-06-10 13:06:11 +0200 |
| commit | a9a370d92c490f3f28cc1a1b1619971832c76de5 (patch) | |
| tree | 566a57b7328188ccbf9c005ae9a464de601caf16 | |
| parent | f3e3a2d40e736e368678adf1c4d2793535dc9acc (diff) | |
* cmdline/apt-get.cc:
- complain correctly about :any build-dep on M-A:none packages
| -rw-r--r-- | cmdline/apt-get.cc | 8 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index ef16a7870..a4fd3cfb9 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -2919,9 +2919,9 @@ bool DoBuildDep(CommandLine &CmdL) if (Ver->MultiArch == pkgCache::Version::None || Ver->MultiArch == pkgCache::Version::All) { if (colon == string::npos) - { Pkg = Ver.ParentPkg().Group().FindPkg(hostArch); - } + else if (strcmp(D->Package.c_str() + colon, ":any") == 0) + forbidden = "Multi-Arch: none"; } else if (Ver->MultiArch == pkgCache::Version::Same) { @@ -2956,13 +2956,13 @@ bool DoBuildDep(CommandLine &CmdL) if (forbidden.empty() == false) { if (_config->FindB("Debug::BuildDeps",false) == true) - cout << " :any is not allowed from M-A: same package " << (*D).Package << endl; + cout << D->Package.substr(colon, string::npos) << " is not allowed from " << forbidden << " package " << (*D).Package << endl; if (hasAlternatives) continue; return _error->Error(_("%s dependency for %s can't be satisfied " "because %s is not allowed on '%s' packages"), Last->BuildDepType(D->Type), Src.c_str(), - D->Package.c_str(), "Multi-Arch: same"); + D->Package.c_str(), forbidden.c_str()); } } else if (_config->FindB("Debug::BuildDeps",false) == true) diff --git a/debian/changelog b/debian/changelog index 91511f2e7..720b07273 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,10 @@ apt (0.9.5.2) UNRELEASED; urgency=low * French program and manpage translation update * Danish program translation by Joe Hansen. Closes: #675605 + [ Thibaut Girka ] + * cmdline/apt-get.cc: + - complain correctly about :any build-dep on M-A:none packages + -- David Kalnischkies <kalnischkies@gmail.com> Wed, 06 Jun 2012 23:54:01 +0200 apt (0.9.5.1) unstable; urgency=low |