aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-14 03:08:11 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-07-14 03:14:01 +0100
commitbdacf3b7fe9b0b955c37d8315a6f36b76405ca82 (patch)
tree2862ebce4b887fbb4c98eedc6b7a7c9b6ee5c01b
parentfabd135405ff2866b91035a565359bd1574019a9 (diff)
downloadpaludis-bdacf3b7fe9b0b955c37d8315a6f36b76405ca82.tar.gz
paludis-bdacf3b7fe9b0b955c37d8315a6f36b76405ca82.tar.xz
Update ConsoleInstallTask for previous (continued)
-rw-r--r--src/output/console_install_task.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index 2b2b232..1a31fea 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -987,14 +987,16 @@ ConsoleInstallTask::display_merge_list_entry_repository(const DepListEntry & d,
.slot_requirement(make_shared_ptr(new UserSlotExactRequirement(d.package_id->slot())))) |
filter::InstalledAtRoot(environment()->root()))]);
bool changed(normal_entry == m &&
- ! inst->empty() && (*inst->begin())->source_origin_key() &&
- (*inst->begin())->source_origin_key()->value() !=
- stringify(d.package_id->repository()->name()));
+ ! inst->empty() && (*inst->begin())->from_repositories_key() &&
+ (*inst->begin())->from_repositories_key()->value()->end() ==
+ (*inst->begin())->from_repositories_key()->value()->find(
+ stringify(d.package_id->repository()->name())));
if (changed || environment()->package_database()->favourite_repository() != d.package_id->repository()->name())
output_no_endl("::" + stringify(d.package_id->repository()->name()));
if (changed)
- output_no_endl(" (previously ::" + (*inst->begin())->source_origin_key()->value() + ")");
+ output_no_endl(" (previously ::" + join((*inst->begin())->from_repositories_key()->value()->begin(),
+ (*inst->begin())->from_repositories_key()->value()->end(), ", ::") + ")");
}
void