aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar David Leverton <levertond@googlemail.com> 2007-02-04 00:19:09 +0000
committerAvatar David Leverton <levertond@googlemail.com> 2007-02-04 00:19:09 +0000
commitcec2d101e1308fda7a0beb31e49b9a2c701189e1 (patch)
treea51e239e32cc3e1a36ffdebe6854a5516da47f05
parent65d08be0ec6876664f7e205fc311043f5fa8c7fd (diff)
downloadpaludis-cec2d101e1308fda7a0beb31e49b9a2c701189e1.tar.gz
paludis-cec2d101e1308fda7a0beb31e49b9a2c701189e1.tar.xz
If there's no installed package in the new package's slot, compare USE-flags against the newest installed package in any slot.
-rw-r--r--src/output/console_install_task.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index a017402..2fc8d1d 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -830,7 +830,7 @@ ConsoleInstallTask::_add_descriptions(std::tr1::shared_ptr<const UseFlagNameColl
void
ConsoleInstallTask::display_merge_list_entry_use(const DepListEntry & d,
- std::tr1::shared_ptr<const PackageDatabaseEntryCollection>,
+ std::tr1::shared_ptr<const PackageDatabaseEntryCollection> existing,
std::tr1::shared_ptr<const PackageDatabaseEntryCollection> existing_slot,
const DisplayMode m)
{
@@ -839,7 +839,8 @@ ConsoleInstallTask::display_merge_list_entry_use(const DepListEntry & d,
output_no_endl(" ");
std::tr1::shared_ptr<UseFlagPrettyPrinter> printer(make_use_flag_pretty_printer());
- printer->print_package_flags(d.package, existing_slot->empty() ? 0 : &*existing_slot->last());
+ printer->print_package_flags(d.package, ! existing_slot->empty() ? &*existing_slot->last() :
+ ! existing->empty() ? &*existing->last() : 0);
_add_descriptions(printer->new_flags(), d.package, uds_new);
_add_descriptions(printer->changed_flags(), d.package, uds_changed);