* fixes in the auto-mark code (thanks to Daniel

  Burrows)

diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc
index 50a75843f23337613fe68082f287dc439f253d52..7f571945412cf7be2b3173c0f18bff5aa1343454 100644 (file)
--- a/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@ -1285,6 +1285,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
                              bool follow_suggests)
 {
    pkgDepCache::StateCache &state = PkgState[pkg->ID];
                              bool follow_suggests)
 {
    pkgDepCache::StateCache &state = PkgState[pkg->ID];

+   VerIterator currver            = pkg.CurrentVer();

    VerIterator candver            = state.CandidateVerIter(*this);
    VerIterator instver            = state.InstVerIter(*this);
 
    VerIterator candver            = state.CandidateVerIter(*this);
    VerIterator instver            = state.InstVerIter(*this);
 


@@ -1305,9 +1306,11 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg,
    }
 #endif
 
    }
 #endif
 

-   // Ignore versions other than the InstVer, and ignore packages
-   // that are already going to be removed or just left uninstalled.
-   if(!(ver == instver && !instver.end()))
+   // For packages that are not going to be removed, ignore versions
+   // other than the InstVer.  For packages that are going to be
+   // removed, ignore versions other than the current version.
+   if(!(ver == instver && !instver.end()) &&
+      !(ver == currver && instver.end() && !ver.end()))

       return;
 
    // if we are marked already we are done
       return;
 
    // if we are marked already we are done

diff --git a/debian/changelog b/debian/changelog
index 23780b5ff7a1359bba3c038adb8951ae9292b61a..d0103f43a3807030cfe3a8288002d7f3ed8c90f9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ apt (0.7.3) unstable; urgency=low
 
   * fixed compile errors with g++ 7.3 (thanks to 
     Daniel Burrows, closes: #429378)
 
   * fixed compile errors with g++ 7.3 (thanks to 
     Daniel Burrows, closes: #429378)

+  * fixes in the auto-mark code (thanks to Daniel
+    Burrows)

   * fix FTFBFS by changing build-depends to
     libcurl4-gnutls-dev (closes: #428363)
   * cmdline/apt-get.cc:
   * fix FTFBFS by changing build-depends to
     libcurl4-gnutls-dev (closes: #428363)
   * cmdline/apt-get.cc: