aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-10 12:15:59 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-10 12:15:59 +0100
commit0316b5a84ed09e910ea388517d87385475fc1ae8 (patch)
treed6016e3682bc67e9f63f33571b7800ccf6132d26
parentf336351f553df7749595109821a1d2892e024e57 (diff)
downloadpaludis-0316b5a84ed09e910ea388517d87385475fc1ae8.tar.gz
paludis-0316b5a84ed09e910ea388517d87385475fc1ae8.tar.xz
Display extra target information
-rw-r--r--src/clients/cave/cmd_display_resolution.cc4
-rw-r--r--src/clients/cave/cmd_resolve_dump.cc4
-rw-r--r--src/clients/cave/resolve_common.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 435f861..736b7c9 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -220,9 +220,9 @@ namespace
", ", stringify_change_by_resolvent), true);
}
- std::pair<std::string, Tribool> visit(const TargetReason &) const
+ std::pair<std::string, Tribool> visit(const TargetReason & r) const
{
- return std::make_pair("target", true);
+ return std::make_pair("target" + (r.extra_information().empty() ? "" : " (" + r.extra_information() + ")"), true);
}
std::pair<std::string, Tribool> visit(const SetReason & r) const
diff --git a/src/clients/cave/cmd_resolve_dump.cc b/src/clients/cave/cmd_resolve_dump.cc
index 604a42e..5c00ad2 100644
--- a/src/clients/cave/cmd_resolve_dump.cc
+++ b/src/clients/cave/cmd_resolve_dump.cc
@@ -147,9 +147,9 @@ namespace
{
}
- void visit(const TargetReason &)
+ void visit(const TargetReason & r)
{
- str = "Target";
+ str = "Target(" + r.extra_information() + ")";
}
void visit(const PresetReason &)
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 19ac6c5..03bdf7b 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -1526,9 +1526,9 @@ namespace
return "from dependent " + stringify(*r.id_and_resolvent_being_removed().package_id());
}
- const std::string visit(const TargetReason &) const
+ const std::string visit(const TargetReason & r) const
{
- return "from target";
+ return "from target" + (r.extra_information().empty() ? "" : " (" + r.extra_information() + ")");
}
const std::string visit(const ViaBinaryReason &) const