aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-05 23:29:01 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-07-05 23:29:01 +0000
commita956e534b82aaab7f5af468f353134af96cf7e75 (patch)
tree265914efde51b5db629bdf34dd76f79d3c9b7676
parentfc8fa1f3cb830d459a0fd56105a450598cd25557 (diff)
downloadpaludis-a956e534b82aaab7f5af468f353134af96cf7e75.tar.gz
paludis-a956e534b82aaab7f5af468f353134af96cf7e75.tar.xz
Tinker
-rw-r--r--src/output/console_install_task.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 20df76e..beda3bb 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -771,8 +771,7 @@ ConsoleInstallTask::display_merge_list_entry_for(const PackageID & d, const Disp
case error_entry:
output_no_endl(" (for ");
- output_no_endl(render_as_package_name(stringify(d.name())));
- output_no_endl("-" + stringify(d.version()) + "::" + stringify(d.repository()->name()));
+ output_no_endl(render_as_package_name(stringify(d)));
output_no_endl(")");
break;
}
@@ -861,14 +860,14 @@ ConsoleInstallTask::display_merge_list_entry_status_and_update_counts(const DepL
else if ((*existing_slot_repo->last())->version() < d.package_id->version())
{
output_no_endl(render_as_update_mode("U " +
- stringify((*existing_slot_repo->last())->version()) + destination_str));
+ stringify((*existing_slot_repo->last())->canonical_form(idcf_version)) + destination_str));
set_count<upgrade_count>(count<upgrade_count>() + 1);
set_count<max_count>(count<max_count>() + 1);
}
else if ((*existing_slot_repo->last())->version() > d.package_id->version())
{
output_no_endl(render_as_update_mode("D " +
- stringify((*existing_slot_repo->last())->version()) + destination_str));
+ stringify((*existing_slot_repo->last())->canonical_form(idcf_version)) + destination_str));
set_count<downgrade_count>(count<downgrade_count>() + 1);
set_count<max_count>(count<max_count>() + 1);
}