aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-10-08 15:36:03 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-10-08 15:36:03 +0100
commit2856841b1949ab5e1287ba3f31ab4c57e45c0c7b (patch)
tree93267ca694479b68fd2031503ca2ce4fa5c15429
parentf4af49b232693d71caf264c03e9d340c586d74fd (diff)
downloadpaludis-2856841b1949ab5e1287ba3f31ab4c57e45c0c7b.tar.gz
paludis-2856841b1949ab5e1287ba3f31ab4c57e45c0c7b.tar.xz
Show blocker annotations
Fixes: ticket:986
-rwxr-xr-xsrc/clients/cave/cmd_display_resolution.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 7d27d60..612c585 100755
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -170,9 +170,10 @@ namespace
std::pair<std::string, Tribool> annotate(
const std::shared_ptr<const MetadataSectionKey> & key,
- const std::pair<std::string, Tribool> unannotated) const
+ const std::pair<std::string, Tribool> unannotated,
+ const bool annotate_regardless) const
{
- if ((! key) || (! more_annotations))
+ if ((! key) || ((! annotate_regardless) && (! more_annotations)))
return unannotated;
std::pair<std::string, Tribool> result(unannotated);
@@ -193,7 +194,7 @@ namespace
return annotate(r.sanitised_dependency().spec().if_block()->annotations_key(),
std::make_pair(stringify(*r.sanitised_dependency().spec().if_block())
+ " from " + (verbose ? stringify(*r.from_id()) : stringify(r.from_id()->name())),
- true));
+ false), true);
else
{
if (verbose)
@@ -209,11 +210,11 @@ namespace
+ (r.sanitised_dependency().active_dependency_labels_as_string().empty() ? "" :
", labelled '" + r.sanitised_dependency().active_dependency_labels_as_string() + "'")
+ as,
- false));
+ false), false);
}
else
return annotate(r.sanitised_dependency().spec().if_package()->annotations_key(),
- std::make_pair(stringify(r.from_id()->name()), false));
+ std::make_pair(stringify(r.from_id()->name()), false), false);
}
}