German translation proof read by Helge Kreutzmann

[apt.git] / apt-pkg / depcache.cc

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index eb8f6460d1454fe2995c3e1de7c05ce6d2be1aaf..3925d2e7ccc3b00c25d6af7c1e2a43ca871043e8 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -12,6 +12,7 @@
 
 #include <apt-pkg/depcache.h>
 #include <apt-pkg/versionmatch.h>
+#include <apt-pkg/version.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/strutl.h>
@@ -273,23 +274,27 @@ bool pkgDepCache::writeStateFile(OpProgress * const /*prog*/, bool const Install
            continue;
         StateCache const &P = PkgState[pkg->ID];
         bool newAuto = (P.Flags & Flag::Auto);
-        // skip not installed or now-removed ones if requested
+        // reset to default (=manual) not installed or now-removed ones if requested
         if (InstalledOnly && (
             (pkg->CurrentVer == 0 && P.Mode != ModeInstall) ||
             (pkg->CurrentVer != 0 && P.Mode == ModeDelete)))
+           newAuto = false;
+        if (newAuto == false)
         {
            // The section is obsolete if it contains no other tag
-           unsigned int const count = section.Count();
+           auto const count = section.Count();
            if (count < 2 ||
                (count == 2 && section.Exists("Auto-Installed")) ||
                (count == 3 && section.Exists("Auto-Installed") && section.Exists("Architecture")))
+           {
+              if(debug_autoremove)
+                 std::clog << "Drop obsolete section with " << count << " fields for " << APT::PrettyPkg(this, pkg) << std::endl;
               continue;
-           else
-              newAuto = false;
+           }
         }
-        if(_config->FindB("Debug::pkgAutoRemove",false))
-           std::clog << "Update existing AutoInstall info: " 
-                     << pkg.FullName() << std::endl;
+
+        if(debug_autoremove)
+           std::clog << "Update existing AutoInstall to " << newAuto << " for " << APT::PrettyPkg(this, pkg) << std::endl;
 
         std::vector<pkgTagSection::Tag> rewrite;
         rewrite.push_back(pkgTagSection::Tag::Rewrite("Architecture", pkg.Arch()));
@@ -306,7 +311,7 @@ bool pkgDepCache::writeStateFile(OpProgress * const /*prog*/, bool const Install
       if(P.Flags & Flag::Auto) {
         if (pkgs_seen.find(pkg.FullName()) != pkgs_seen.end()) {
            if(debug_autoremove)
-              std::clog << "Skipping already written " << pkg.FullName() << std::endl;
+              std::clog << "Skipping already written " << APT::PrettyPkg(this, pkg) << std::endl;
            continue;
         }
         // skip not installed ones if requested
@@ -314,14 +319,11 @@ bool pkgDepCache::writeStateFile(OpProgress * const /*prog*/, bool const Install
             (pkg->CurrentVer == 0 && P.Mode != ModeInstall) ||
             (pkg->CurrentVer != 0 && P.Mode == ModeDelete)))
            continue;
-        const char* const pkgarch = pkg.Arch();
-        if (strcmp(pkgarch, "all") == 0)
-           continue;
         if(debug_autoremove)
-           std::clog << "Writing new AutoInstall: " << pkg.FullName() << std::endl;
+           std::clog << "Writing new AutoInstall: " << APT::PrettyPkg(this, pkg) << std::endl;
         std::string stanza = "Package: ";
         stanza.append(pkg.Name())
-             .append("\nArchitecture: ").append(pkgarch)
+             .append("\nArchitecture: ").append(pkg.Arch())
              .append("\nAuto-Installed: 1\n\n");
         if (OutFile.Write(stanza.c_str(), stanza.length()) == false)
            return false;
@@ -1927,10 +1929,11 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &Pkg,
         continue;
 
       // handle the virtual part first
+      APT::VersionVector providers;
       for(auto Prv = T.ProvidesList(); Prv.end() == false; ++Prv)
       {
         auto PP = Prv.OwnerPkg();
-        if (PkgState[PP->ID].Marked || IsPkgInBoringState(PP, PkgState))
+        if (IsPkgInBoringState(PP, PkgState))
            continue;
 
         // we want to ignore provides from uninteresting versions
@@ -1939,10 +1942,37 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &Pkg,
         if (unlikely(PV.end()) || PV != Prv.OwnerVer() || D.IsSatisfied(Prv) == false)
            continue;
 
-        if (debug_autoremove)
-           std::clog << "Following dep: " << APT::PrettyDep(this, D)
-              << ", provided by " << PP.FullName() << " " << PV.VerStr() << std::endl;
-        MarkPackage(PP, PV, follow_recommends, follow_suggests);
+        providers.emplace_back(PV);
+      }
+      if (providers.empty() == false)
+      {
+        // sort providers by source version so that only the latest versioned
+        // binary package of a source package is marked instead of all
+        std::sort(providers.begin(), providers.end(),
+           [](pkgCache::VerIterator const &A, pkgCache::VerIterator const &B) {
+              auto const nameret = strcmp(A.SourcePkgName(), B.SourcePkgName());
+              if (nameret != 0)
+                 return nameret < 0;
+              auto const verret = A.Cache()->VS->CmpVersion(A.SourceVerStr(), B.SourceVerStr());
+              if (verret != 0)
+                 return verret > 0;
+              return strcmp(A.ParentPkg().Name(), B.ParentPkg().Name()) < 0;
+        });
+        auto const prvsize = providers.size();
+        providers.erase(std::unique(providers.begin(), providers.end(),
+           [](pkgCache::VerIterator const &A, pkgCache::VerIterator const &B) {
+              return strcmp(A.SourcePkgName(), B.SourcePkgName()) == 0 &&
+                 strcmp(A.SourceVerStr(), B.SourceVerStr()) != 0;
+           }), providers.end());
+        for (auto && PV: providers)
+        {
+           auto const PP = PV.ParentPkg();
+           if (debug_autoremove)
+              std::clog << "Following dep: " << APT::PrettyDep(this, D)
+                 << ", provided by " << PP.FullName() << " " << PV.VerStr()
+                 << " (" << providers.size() << "/" << prvsize << ")"<< std::endl;
+           MarkPackage(PP, PV, follow_recommends, follow_suggests);
+        }
       }
 
       // now deal with the real part of the package