diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2011-11-03 09:41:14 -0500 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2011-11-03 09:41:14 -0500 |
| commit | 04340db392f14e2610189db6f8787e10fbf3c6d0 (patch) | |
| tree | b0769df88e2b6496f23e3d899aeb1c240a3488d9 | |
| parent | d9f6c79566a94cf4da20d55edececcaa11ffaa1b (diff) | |
* apt-pkg/deb/deblistparser.cc:
- M-A: foreign packages provide for other archs, too
| -rw-r--r-- | apt-pkg/deb/deblistparser.cc | 3 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc index fd3e4808d..28568d5e3 100644 --- a/apt-pkg/deb/deblistparser.cc +++ b/apt-pkg/deb/deblistparser.cc @@ -675,6 +675,9 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver) return _error->Error("Problem parsing Provides line"); if (Op != pkgCache::Dep::NoOp) { _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str()); + } else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) { + if (NewProvidesAllArch(Ver, Package, Version) == false) + return false; } else { if (NewProvides(Ver, Package, Arch, Version) == false) return false; diff --git a/debian/changelog b/debian/changelog index bb26800fe..df50eefbd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,8 +7,10 @@ apt (0.8.16~exp8) experimental; urgency=low - do not enter an endless loop for (essential) pre-dependency loops * apt-pkg/contrib/sha2_internal.cc: - use a pointer-union to peace gcc strict-aliasing warning + * apt-pkg/deb/deblistparser.cc: + - M-A: foreign packages provide for other archs, too - -- David Kalnischkies <kalnischkies@gmail.com> Mon, 31 Oct 2011 14:34:48 -0500 + -- David Kalnischkies <kalnischkies@gmail.com> Thu, 03 Nov 2011 09:40:29 -0500 apt (0.8.16~exp7) experimental; urgency=low |