diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-18 15:39:03 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-18 15:39:03 +0100 |
| commit | 113942be71c90e7d6a9cff93cc05ac119db526de (patch) | |
| tree | 2872bfb8c3b12dc8f9fe9e1622ddffeea528d4e6 /cmdline/apt-get.cc | |
| parent | b9dacd11a4707092f070d49b1cb1acff642eebf0 (diff) | |
| parent | 3c5a611808e7af5aec4c2ab12ce0bce79f74928d (diff) | |
merge from the lp:~donkult/apt/sid branch
Diffstat (limited to 'cmdline/apt-get.cc')
| -rw-r--r-- | cmdline/apt-get.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 34ae2fed9..5a814e255 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1504,10 +1504,9 @@ bool DoAutomaticRemove(CacheFile &Cache) // only show stuff in the list that is not yet marked for removal if(Cache[Pkg].Delete() == false) { + ++autoRemoveCount; // we don't need to fill the strings if we don't need them - if (smallList == true) - ++autoRemoveCount; - else + if (smallList == false) { autoremovelist += string(Pkg.Name()) + " "; autoremoveversions += string(Cache[Pkg].CandVersion) + "\n"; @@ -1520,9 +1519,12 @@ bool DoAutomaticRemove(CacheFile &Cache) if (doAutoRemove == false && (autoremovelist.empty() == false || autoRemoveCount != 0)) { if (smallList == false) - ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions); + ShowList(c1out, P_("The following package is automatically installed and is no longer required:", + "The following packages were automatically installed and are no longer required:", + autoRemoveCount), autoremovelist, autoremoveversions); else - ioprintf(c1out, _("%lu packages were automatically installed and are no longer required.\n"), autoRemoveCount); + ioprintf(c1out, P_("%lu package was automatically installed and is no longer required.\n", + "%lu packages were automatically installed and are no longer required.\n", autoRemoveCount), autoRemoveCount); c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl; } // Now see if we had destroyed anything (if we had done anything) |