diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-08 20:11:30 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2006-09-08 20:11:30 +0200 |
| commit | de86a3614abf494c73e534c055aabcea3494f0ae (patch) | |
| tree | 038ae0f41885e4650887640288b10d7334e101d4 | |
| parent | 2ea152b6fb5799f180d4133dc76c52cf1a122f54 (diff) | |
| parent | c15f569038c9d08cfb5186945d9c5095f7776768 (diff) | |
* apt-pkg/algorithms.cc:
- merged from apt--auto-mark (preserve auto-install information in InstallProtect
* cmdline/apt-get.cc:
- fix typo
* cmdline/makefile:
- install apt-mark as well
| -rw-r--r-- | apt-pkg/algorithms.cc | 9 | ||||
| -rw-r--r-- | cmdline/apt-get.cc | 2 | ||||
| -rw-r--r-- | cmdline/makefile | 6 | ||||
| -rw-r--r-- | debian/changelog | 10 |
4 files changed, 24 insertions, 3 deletions
diff --git a/apt-pkg/algorithms.cc b/apt-pkg/algorithms.cc index f50c52a32..ddfda754d 100644 --- a/apt-pkg/algorithms.cc +++ b/apt-pkg/algorithms.cc @@ -1250,8 +1250,13 @@ void pkgProblemResolver::InstallProtect() { if ((Flags[I->ID] & ToRemove) == ToRemove) Cache.MarkDelete(I); - else - Cache.MarkInstall(I, false, 0, false); + else + { + // preserver the information if the package was auto + // or manual installed + bool autoInst = (Cache[I].Flags & pkgCache::Flag::Auto); + Cache.MarkInstall(I, false, 0, !autoInst); + } } } } diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7b70de3bd..05a256ec4 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1451,7 +1451,7 @@ bool DoAutomaticRemove(CacheFile &Cache) } } } - ShowList(c1out, _("The following packages where automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); if (!_config->FindB("APT::Get::AutomaticRemove") && autoremovelist.size() > 0) c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; diff --git a/cmdline/makefile b/cmdline/makefile index 882a0e1b5..49035be44 100644 --- a/cmdline/makefile +++ b/cmdline/makefile @@ -52,3 +52,9 @@ SOURCE=apt-key TO=$(BIN) TARGET=program include $(COPY_H) + +# The apt-mark program +SOURCE=apt-mark +TO=$(BIN) +TARGET=program +include $(COPY_H) diff --git a/debian/changelog b/debian/changelog index c76ca0f69..8ae6e1381 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +apt (0.6.45ubuntu8) edgy; urgency=low + + * apt-pkg/algorithm.cc: + - fix pkgProblemResolver.InstallProtect() to preserve the auto-install + information (lp: #59457) + * cmdline/apt-get.cc: + - fix typo in autoremove information (lp: #59420) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200 + apt (0.6.45ubuntu7) edgy; urgency=low * apt-pkg/depcache.cc: |