[paludis-commits] paludis.git (master) -- 159ec22 by David Leverton

[git at git.pioto.org]

Module:    paludis.git
Branch:    master
Commit:    159ec2267f4a9410f77e4e242a5f42d455a2b799
URL:       http://git.pioto.org/?p=paludis.git;a=commit;h=159ec2267f4a9410f77e4e242a5f42d455a2b799

Author:    David Leverton <levertond at googlemail.com>
Committer: David Leverton <levertond at googlemail.com>
Date:      Fri Sep 12 16:39:39 2008 +0100

----

Show old-style virtuals in -pi output if they would provide useful information about deps etc.

----

 src/output/console_install_task.cc |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)


diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index f5bf97b..3a817b1 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -325,14 +325,24 @@ ConsoleInstallTask::on_display_merge_list_entry(const DepListEntry & d)
     {
         switch (d.kind)
         {
-            case dlk_provided:
-            case dlk_virtual:
             case dlk_already_installed:
                 if (! want_full_install_reasons())
                     return;
                 m = unimportant_entry;
                 continue;
 
+            case dlk_provided:
+            case dlk_virtual:
+                if (d.tags->empty())
+                {
+                    if (! want_full_install_reasons())
+                        return;
+                    m = unimportant_entry;
+                }
+                else
+                    m = normal_entry;
+                continue;
+
             case dlk_package:
             case dlk_subpackage:
                 m = normal_entry;
@@ -1048,9 +1058,12 @@ ConsoleInstallTask::display_merge_list_entry_status_and_update_counts(const DepL
                 output_no_endl(render_as_update_mode(" ["));
 
                 std::string destination_str;
-                std::tr1::shared_ptr<const DestinationsSet> default_destinations(environment()->default_destinations());
-                if (default_destinations->end() == default_destinations->find(d.destination))
-                    destination_str = " ::" + stringify(d.destination->name());
+                if (! d.package_id->virtual_for_key())
+                {
+                    std::tr1::shared_ptr<const DestinationsSet> default_destinations(environment()->default_destinations());
+                    if (default_destinations->end() == default_destinations->find(d.destination))
+                        destination_str = " ::" + stringify(d.destination->name());
+                }
 
                 if (existing_repo->empty())
                 {
---