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

return in SingleArch a package also for "any"

David Kalnischkies лет назад: 16
Родитель
Сommit
a101a93299
2 измененных файлов с 2 добавлено и 1 удалено
  1. 1 1
      apt-pkg/pkgcache.cc
  2. 1 0
      debian/changelog

+ 1 - 1
apt-pkg/pkgcache.cc

@@ -221,7 +221,7 @@ pkgCache::PkgIterator pkgCache::FindPkg(const string &Name) {
 /* Returns 0 on error, pointer to the package otherwise */
 pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string const &Arch) {
 	if (MultiArchCache() == false) {
-		if (Arch == "native" || Arch == "all" ||
+		if (Arch == "native" || Arch == "all" || Arch == "any" ||
 		    Arch == _config->Find("APT::Architecture"))
 			return SingleArchFindPkg(Name);
 		else

+ 1 - 0
debian/changelog

@@ -14,6 +14,7 @@ apt (0.7.26~exp4) UNRELEASED; urgency=low
   * apt-pkg/depcache.cc:
     - rewrite the pseudo package reinstaller to be more intelligent
       in his package choices
+    - return in SingleArch a package also for "any"
   * apt-pkg/packagemanager.cc:
     - don't try to "unpack" pseudo packages twice
   * apt-pkg/contrib/fileutl.cc: