aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 16:30:16 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-02-05 16:34:03 +0000
commit51bbc34899711cf79e6fc8525e51fb8fd9ba7a64 (patch)
tree2108f62897567e3e31b8609e5d2fb9a364874e32
parent9c0d06e0d4012eca97da985d0d7b60f00495dc4e (diff)
downloadpaludis-51bbc34899711cf79e6fc8525e51fb8fd9ba7a64.tar.gz
paludis-51bbc34899711cf79e6fc8525e51fb8fd9ba7a64.tar.xz
Show which versions we're removing
-rw-r--r--src/clients/cave/cmd_display_resolution.cc21
-rw-r--r--src/clients/cave/cmd_resolve_dump.cc3
2 files changed, 21 insertions, 3 deletions
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 12cfa71..d8d98b6 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -281,10 +281,13 @@ namespace
cout << " Use existing ID " << *d.existing_id() << endl;
}
- void visit(const RemoveDecision &) const
+ void visit(const RemoveDecision & d) const
{
cout << " The decision made was:" << endl;
cout << " Remove existing IDs" << endl;
+ for (PackageIDSequence::ConstIterator i(d.ids()->begin()), i_end(d.ids()->end()) ;
+ i != i_end ; ++i)
+ cout << " Remove " << **i << endl;
}
void visit(const NothingNoChangeDecision &) const
@@ -626,7 +629,21 @@ namespace
const DisplayResolutionCommandLine &,
const UninstallJob & job)
{
- cout << "< " << c::bold_green() << job.resolution()->resolvent() << c::normal() << endl;
+ cout << "< " << c::bold_green() << job.resolution()->resolvent() << c::normal() << " ";
+
+ bool first(true);
+ for (PackageIDSequence::ConstIterator i(job.remove_decision()->ids()->begin()),
+ i_end(job.remove_decision()->ids()->end()) ;
+ i != i_end ; ++i)
+ {
+ if (! first)
+ cout << ", ";
+ first = false;
+
+ cout << (*i)->canonical_form(idcf_version);
+ }
+
+ cout << endl;
display_reasons(job.resolution());
}
diff --git a/src/clients/cave/cmd_resolve_dump.cc b/src/clients/cave/cmd_resolve_dump.cc
index 66482e7..40f8fa3 100644
--- a/src/clients/cave/cmd_resolve_dump.cc
+++ b/src/clients/cave/cmd_resolve_dump.cc
@@ -79,7 +79,8 @@ namespace
const std::string visit(const RemoveDecision & d) const
{
- return "RemoveDecision(taken: " + stringify(d.taken()) + ")";
+ return "RemoveDecision(ids: " + join(indirect_iterator(d.ids()->begin()),
+ indirect_iterator(d.ids()->end()), ", ") + " taken: " + stringify(d.taken()) + ")";
}
const std::string visit(const NothingNoChangeDecision & d) const