diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2015-09-18 09:54:09 +0200 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2015-09-18 09:54:09 +0200 |
| commit | 41dd8be8fa4b3a8893b39713c9c1e9473e3d6708 (patch) | |
| tree | d067110b636b7ac427f37dc4ba2cdf4b58201ac8 | |
| parent | 2061c8671f05741291ed1c77418fa583cfd05d41 (diff) | |
Fix regression in the Never-MarkAuto-Sections feature caused by the previous auto-removal fix, with inspiration drawn from the patches and conversation from http://bugs.debian.org/793360 (LP: #1479207)
| -rw-r--r-- | apt-pkg/depcache.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 16282df21..dee5318ea 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1226,7 +1226,7 @@ bool pkgDepCache::MarkInstall(PkgIterator const &Pkg,bool AutoInst, continue; } // now check if we should consider it a automatic dependency or not - if(InstPkg->CurrentVer == 0 && InstVer->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", InstVer.Section())) + if(InstPkg->CurrentVer == 0 && P.InstVerIter(*this)->Section != 0 && ConfigValueInSubTree("APT::Never-MarkAuto-Sections", P.InstVerIter(*this).Section())) { if(DebugAutoInstall == true) std::clog << OutputInDepth(Depth) << "Setting NOT as auto-installed (direct " diff --git a/debian/changelog b/debian/changelog index 64ef12c04..ab27d3df7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (1.0.9.10ubuntu6) wily; urgency=medium + + * Fix regression in the Never-MarkAuto-Sections feature caused by the + previous auto-removal fix, with inspiration drawn from the patches + and conversation from http://bugs.debian.org/793360 (LP: #1479207) + + -- Adam Conrad <adconrad@ubuntu.com> Sat, 01 Aug 2015 16:14:05 -0600 + apt (1.0.9.10ubuntu5) wily; urgency=medium * apt-pkg/packagemanager.h: |