solver3: Simplify WhyStr()

Reuse the generic variable rendering

1 files changed, 5 insertions, 16 deletions

diff --git a/apt-pkg/solver3.cc b/apt-pkg/solver3.cc
index b098d33ba..fce7da0d6 100644
--- a/apt-pkg/solver3.cc
+++ b/apt-pkg/solver3.cc
@@ -239,22 +239,11 @@ std::string APT::Solver::WhyStr(Var reason)
 
    while (not reason.empty())
    {
-      if (auto Pkg = reason.Pkg(cache); not Pkg.end())
-      {
-	 if ((*this)[Pkg].decision == Decision::MUSTNOT)
-	    out.push_back(std::string("not ") + Pkg.FullName());
-	 else
-	    out.push_back(Pkg.FullName());
-	 reason = (*this)[Pkg].reason;
-      }
-      if (auto Ver = reason.Ver(cache); not Ver.end())
-      {
-	 if ((*this)[Ver].decision == Decision::MUSTNOT)
-	    out.push_back(std::string("not ") + Ver.ParentPkg().FullName() + "=" + Ver.VerStr());
-	 else
-	    out.push_back(Ver.ParentPkg().FullName() + "=" + Ver.VerStr());
-	 reason = (*this)[Ver].reason;
-      }
+      if ((*this)[reason].decision == Decision::MUSTNOT)
+	 out.push_back(std::string("not ") + reason.toString(cache));
+      else
+	 out.push_back(reason.toString(cache));
+      reason = (*this)[reason].reason;
    }
 
    std::string outstr;