Просмотр исходного кода

* apt-pkg/deb/deblistparser.cc:
- M-A: foreign packages provide for other archs, too

David Kalnischkies лет назад: 14
Родитель
Сommit
04340db392
2 измененных файлов с 6 добавлено и 1 удалено
  1. 3 0
      apt-pkg/deb/deblistparser.cc
  2. 3 1
      debian/changelog

+ 3 - 0
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;

+ 3 - 1
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