diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:05:55 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-14 19:05:55 +0000 |
| commit | 538149e90012f016a3565246126c2592cdea5eee (patch) | |
| tree | 49df633d6095c5c7605b3680a8a2f750ecc699fd /apt-private/private-output.cc | |
| parent | Releasing progress-linux version 2.9.0-0.0~progress7.99u1. (diff) | |
| download | apt-538149e90012f016a3565246126c2592cdea5eee.tar.xz apt-538149e90012f016a3565246126c2592cdea5eee.zip | |
Merging upstream version 2.9.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'apt-private/private-output.cc')
| -rw-r--r-- | apt-private/private-output.cc | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index bbf5039..95dc740 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -642,14 +642,14 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) }, &PrettyFullName, CurrentToCandidateVersion(&Cache), - "APT::Color::Green"); + "APT::Color::Yellow"); } /*}}}*/ // ShowHold - Show held but changed packages /*{{{*/ bool ShowHold(ostream &out,CacheFile &Cache) { SortedPackageUniverse Universe(Cache); - auto title = _config->FindI("APT::Output-Version") < 30 ? _("The following held packages will be changed:") : _("Changing held packages:Changing held packages:"); + auto title = _config->FindI("APT::Output-Version") < 30 ? _("The following held packages will be changed:") : _("Changing held packages:"); return ShowList(out, title, Universe, [&Cache](pkgCache::PkgIterator const &Pkg) { @@ -758,9 +758,11 @@ void Stats(ostream &out, pkgDepCache &Dep, APT::PackageVector const &HeldBackPac if (Dep[I].Delete() == false && (Dep[I].iFlags & pkgDepCache::ReInstall) == pkgDepCache::ReInstall) ReInstall++; } - if (outVer >= 30) - ioprintf(out, _("Summary:\n")); - ioprintf(out,outVer < 30 ? _("%lu upgraded, %lu newly installed, ") : _(" Upgrading: %lu, Installing: %lu, "), + if (outVer >= 30) { + ioprintf(out, _("Summary:")); + ioprintf(out, "\n "); + } + ioprintf(out,outVer < 30 ? _("%lu upgraded, %lu newly installed, ") : _("Upgrading: %lu, Installing: %lu, "), Upgrade,Install); if (ReInstall != 0) @@ -771,10 +773,12 @@ void Stats(ostream &out, pkgDepCache &Dep, APT::PackageVector const &HeldBackPac ioprintf(out, outVer < 30 ? _("%lu to remove and %lu not upgraded.\n") : _("Removing: %lu, Not Upgrading: %lu\n"), Dep.DelCount(), HeldBackPackages.size()); - // FIXME: outVer - if (Dep.BadCount() != 0) + if (Dep.BadCount() != 0) { + if (outVer >= 30) + ioprintf(out, " "); ioprintf(out,_("%lu not fully installed or removed.\n"), Dep.BadCount()); + } } /*}}}*/ // YnPrompt - Yes No Prompt. /*{{{*/ |