2 files changed, 84 insertions, 17 deletions

diff --git a/apt-pkg/prettyprinters.cc b/apt-pkg/prettyprinters.cc
index a736cabf4..87e78bbde 100644
--- a/apt-pkg/prettyprinters.cc
+++ b/apt-pkg/prettyprinters.cc
@@ -21,19 +21,86 @@ std::ostream& operator<<(std::ostream& os, const APT::PrettyPkg& pp)	/*{{{*/
    if (pp.Pkg.end() == true)
       return os << "invalid package";
 
-   std::string current = (pp.Pkg.CurVersion() == 0 ? "none" : pp.Pkg.CurVersion());
-   std::string candidate = (*pp.DepCache)[pp.Pkg].CandVersion;
-   std::string newest = (pp.Pkg.VersionList().end() ? "none" : pp.Pkg.VersionList().VerStr());
-
-   os << pp.Pkg.Name() << " [ " << pp.Pkg.Arch() << " ] < " << current;
-   if (current != candidate)
-      os << " -> " << candidate;
-   if ( newest != "none" && candidate != newest)
-      os << " | " << newest;
-   if (pp.Pkg->VersionList == 0)
-      os << " > ( none )";
-   else
-      os << " > ( " << (pp.Pkg.VersionList().Section()==0?"unknown":pp.Pkg.VersionList().Section()) << " )";
+   auto state = (*pp.DepCache)[pp.Pkg];
+   std::string const current = (pp.Pkg.CurVersion() == 0 ? "none" : pp.Pkg.CurVersion());
+   std::string candidate = state.CandVersion;
+   if (candidate.empty())
+      candidate = "none";
+   std::string install = "none";
+   if (state.InstallVer != nullptr)
+      install = state.InstVerIter(*pp.DepCache).VerStr();
+
+   os << pp.Pkg.FullName(false) << " < " << current;
+   if (current != install && install != "none")
+      os << " -> " << install;
+   if (install != candidate && current != candidate)
+      os << " | " << candidate;
+   os << " @";
+   switch (pp.Pkg->SelectedState)
+   {
+      case pkgCache::State::Unknown: os << 'u'; break;
+      case pkgCache::State::Install: os << 'i'; break;
+      case pkgCache::State::Hold: os << 'h'; break;
+      case pkgCache::State::DeInstall: os << 'r'; break;
+      case pkgCache::State::Purge: os << 'p'; break;
+      default: os << 'X';
+   }
+   switch (pp.Pkg->InstState)
+   {
+      case pkgCache::State::Ok: break;
+      case pkgCache::State::ReInstReq: os << 'R'; break;
+      case pkgCache::State::HoldInst: os << 'H'; break;
+      case pkgCache::State::HoldReInstReq: os << "HR"; break;
+      default: os << 'X';
+   }
+   switch (pp.Pkg->CurrentState)
+   {
+      case pkgCache::State::NotInstalled: os << 'n'; break;
+      case pkgCache::State::ConfigFiles: os << 'c'; break;
+      case pkgCache::State::HalfInstalled: os << 'H'; break;
+      case pkgCache::State::UnPacked: os << 'U'; break;
+      case pkgCache::State::HalfConfigured: os << 'F'; break;
+      case pkgCache::State::TriggersAwaited: os << 'W'; break;
+      case pkgCache::State::TriggersPending: os << 'T'; break;
+      case pkgCache::State::Installed: os << 'i'; break;
+      default: os << 'X';
+   }
+   os << ' ';
+   if (state.Protect())
+      os << "p";
+   if (state.ReInstall())
+      os << "r";
+   if (state.Upgradable())
+      os << "u";
+   if (state.Marked)
+      os << "m";
+   if (state.Garbage)
+      os << "g";
+   if (state.NewInstall())
+      os << "N";
+   else if (state.Upgrade())
+      os << "U";
+   else if (state.Downgrade())
+      os << "D";
+   else if (state.Install())
+      os << "I";
+   else if (state.Purge())
+      os << "P";
+   else if (state.Delete())
+      os << "R";
+   else if (state.Held())
+      os << "H";
+   else if (state.Keep())
+      os << "K";
+   if (state.NowBroken())
+      os << " Nb";
+   else if (state.NowPolicyBroken())
+      os << " NPb";
+   if (state.InstBroken())
+      os << " Ib";
+   else if (state.InstPolicyBroken())
+      os << " IPb";
+   os << " >";
    return os;
 }
 									/*}}}*/
diff --git a/apt-pkg/prettyprinters.h b/apt-pkg/prettyprinters.h
index 4af0ecebd..51d9f81a0 100644
--- a/apt-pkg/prettyprinters.h
+++ b/apt-pkg/prettyprinters.h
@@ -14,9 +14,9 @@ namespace APT {
  */
 struct PrettyPkg
 {
-   pkgDepCache const * const DepCache;
+   pkgDepCache * const DepCache;
    pkgCache::PkgIterator const Pkg;
-   PrettyPkg(pkgDepCache const * const depcache, pkgCache::PkgIterator const &pkg) APT_NONNULL(2) : DepCache(depcache), Pkg(pkg) {}
+   PrettyPkg(pkgDepCache * const depcache, pkgCache::PkgIterator const &pkg) APT_NONNULL(2) : DepCache(depcache), Pkg(pkg) {}
 };
 /** helper to format DepIterator for easier printing in debug messages.
  *
@@ -25,9 +25,9 @@ struct PrettyPkg
  */
 struct PrettyDep
 {
-   pkgDepCache const * const DepCache;
+   pkgDepCache * const DepCache;
    pkgCache::DepIterator const Dep;
-   PrettyDep(pkgDepCache const * const depcache, pkgCache::DepIterator const &dep) APT_NONNULL(2) : DepCache(depcache), Dep(dep) {}
+   PrettyDep(pkgDepCache * const depcache, pkgCache::DepIterator const &dep) APT_NONNULL(2) : DepCache(depcache), Dep(dep) {}
 };
 
 }