diff options
| author | Julian Andres Klode <jak@debian.org> | 2024-04-14 16:44:41 +0000 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2024-04-14 16:44:41 +0000 |
| commit | e7f0d39ee9e6ca3de71c4a9bc52be6de26ea18a0 (patch) | |
| tree | 4c90407406575507180456b4df9f00ef4292366a /apt-private/private-output.cc | |
| parent | b54308e8545f90928e3fcde5c0df52b22295042f (diff) | |
| parent | ac8fe4b030754584cda9cb1707fc3d9f0d792366 (diff) | |
Merge branch 'ui-2.9.1' into 'main'
UI improvements for 2.9.1
See merge request apt-team/apt!338
Diffstat (limited to 'apt-private/private-output.cc')
| -rw-r--r-- | apt-private/private-output.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc index f6df3f46c..95dc740cc 100644 --- a/apt-private/private-output.cc +++ b/apt-private/private-output.cc @@ -642,7 +642,7 @@ bool ShowDowngraded(ostream &out,CacheFile &Cache) }, &PrettyFullName, CurrentToCandidateVersion(&Cache), - "APT::Color::Green"); + "APT::Color::Yellow"); } /*}}}*/ // ShowHold - Show held but changed packages /*{{{*/ @@ -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. /*{{{*/ |