Merge branch 'edsp-downloadable' into 'main'

Consider 0-size debs not downloadable, set a size in EDSP

See merge request apt-team/apt!454

1 files changed, 5 insertions, 6 deletions

diff --git a/apt-pkg/solver3.cc b/apt-pkg/solver3.cc
index 7117296ab..c1a1098b5 100644
--- a/apt-pkg/solver3.cc
+++ b/apt-pkg/solver3.cc
@@ -336,12 +336,11 @@ bool APT::Solver::Obsolete(pkgCache::PkgIterator pkg) const
    if (ObsoletedByNewerSourceVersion(ver))
       return true;
 
-   for (auto file = ver.FileList(); !file.end(); file++)
-      if ((file.File()->Flags & pkgCache::Flag::NotSource) == 0)
-      {
-	 pkgObsolete[pkg] = 1;
-	 return false;
-      }
+   if (ver.Downloadable())
+   {
+      pkgObsolete[pkg] = 1;
+      return false;
+   }
    if (debug >= 3)
       std::cerr << "Obsolete: " << ver.ParentPkg().FullName() << "=" << ver.VerStr() << " - not installable\n";
    pkgObsolete[pkg] = 2;