aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-11 22:04:05 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-11-11 22:04:05 +0000
commit17bb431323b6ae2fc9b7da6015c6590d317aa33c (patch)
treec1d78dd05bfa05872d5314efdd4fc9d8efcc687e
parent27aa3ecc6801f1e9e7335ffcbcfb023a324d2ca7 (diff)
downloadpaludis-17bb431323b6ae2fc9b7da6015c6590d317aa33c.tar.gz
paludis-17bb431323b6ae2fc9b7da6015c6590d317aa33c.tar.xz
Mark virtual packages as to be skipped
-rw-r--r--paludis/dep_list.cc6
-rw-r--r--paludis/dep_list.sr2
-rw-r--r--paludis/tasks/install_task.cc2
-rw-r--r--src/gtkpaludis/queue_list.cc2
-rw-r--r--src/paludis/install.cc16
5 files changed, 14 insertions, 14 deletions
diff --git a/paludis/dep_list.cc b/paludis/dep_list.cc
index 9cd09bb..de145d5 100644
--- a/paludis/dep_list.cc
+++ b/paludis/dep_list.cc
@@ -617,7 +617,7 @@ DepList::add_package(const PackageDatabaseEntry & p, DepTag::ConstPointer tag)
.generation(_imp->merge_list_generation)
.state(dle_no_deps)
.tags(DepListEntryTags::Pointer(new DepListEntryTags::Concrete))
- .already_installed(false))),
+ .skip_install(metadata->get_virtual_interface()))),
our_merge_entry_post_position(our_merge_entry_position);
if (tag)
@@ -669,7 +669,7 @@ DepList::add_package(const PackageDatabaseEntry & p, DepTag::ConstPointer tag)
.generation(_imp->merge_list_generation)
.state(dle_has_all_deps)
.tags(DepListEntryTags::Pointer(new DepListEntryTags::Concrete))
- .already_installed(false)));
+ .skip_install(m->get_virtual_interface())));
}
}
@@ -744,7 +744,7 @@ DepList::add_already_installed_package(const PackageDatabaseEntry & p, DepTag::C
.generation(_imp->merge_list_generation)
.tags(DepListEntryTags::Pointer(new DepListEntryTags::Concrete))
.state(dle_has_pre_deps)
- .already_installed(true)));
+ .skip_install(true)));
if (tag)
our_merge_entry->tags->insert(DepTagEntry::create()
diff --git a/paludis/dep_list.sr b/paludis/dep_list.sr
index ad5d11f..74ea6a3 100644
--- a/paludis/dep_list.sr
+++ b/paludis/dep_list.sr
@@ -44,7 +44,7 @@ make_class_DepListEntry()
key generation long
key state DepListEntryState
- key already_installed bool
+ key skip_install bool
allow_named_args
diff --git a/paludis/tasks/install_task.cc b/paludis/tasks/install_task.cc
index 4d652c4..8249ddd 100644
--- a/paludis/tasks/install_task.cc
+++ b/paludis/tasks/install_task.cc
@@ -214,7 +214,7 @@ InstallTask::execute()
for (DepList::Iterator dep(_imp->dep_list.begin()), dep_end(_imp->dep_list.end()) ;
dep != dep_end ; ++dep)
{
- if (dep->already_installed)
+ if (dep->skip_install)
continue;
_imp->current_dep_list_entry = dep;
diff --git a/src/gtkpaludis/queue_list.cc b/src/gtkpaludis/queue_list.cc
index c8602c4..be7a326 100644
--- a/src/gtkpaludis/queue_list.cc
+++ b/src/gtkpaludis/queue_list.cc
@@ -288,7 +288,7 @@ QueueList::Populate::operator() ()
void
QueueList::Populate::display_entry(const paludis::DepListEntry & e)
{
- if (e.already_installed)
+ if (e.skip_install)
return;
Gtk::TreeModel::Row row = *(_model->append());
diff --git a/src/paludis/install.cc b/src/paludis/install.cc
index d042627..7d9af88 100644
--- a/src/paludis/install.cc
+++ b/src/paludis/install.cc
@@ -406,12 +406,12 @@ namespace
void
OurInstallTask::on_display_merge_list_entry(const DepListEntry & d)
{
- if (d.already_installed && CommandLine::get_instance()->a_show_install_reasons.argument() != "full")
+ if (d.skip_install && CommandLine::get_instance()->a_show_install_reasons.argument() != "full")
return;
Context context("When displaying entry '" + stringify(d.package) + "':");
- cout << "* " << colour(d.already_installed ? cl_unimportant : cl_package_name,
+ cout << "* " << colour(d.skip_install ? cl_unimportant : cl_package_name,
d.package.name);
/* display version, unless it's 0 and our category is "virtual" */
@@ -426,7 +426,7 @@ namespace
/* display slot name, unless it's 0 */
if (SlotName("0") != d.metadata->slot)
- cout << colour(d.already_installed ? cl_unimportant : cl_slot,
+ cout << colour(d.skip_install ? cl_unimportant : cl_slot,
" {:" + stringify(d.metadata->slot) + "}");
/* indicate [U], [S], [N] or [-]. display existing version, if we're
@@ -435,7 +435,7 @@ namespace
query(PackageDepAtom::Pointer(new PackageDepAtom(stringify(
d.package.name))), is_installed_only));
- if (d.already_installed)
+ if (d.skip_install)
cout << colour(cl_unimportant, " [-]");
else if (existing->empty())
{
@@ -522,7 +522,7 @@ namespace
PackageDatabaseEntry p(d.package);
/* display USE flags */
- if (! d.already_installed)
+ if (! d.skip_install)
std::cout << make_pretty_use_flags_string(DefaultEnvironment::get_instance(), p, d.metadata,
(existing->empty() ? 0 : &*existing->last()));
@@ -547,7 +547,7 @@ namespace
if (! tag_titles.empty())
{
tag_titles.erase(tag_titles.length() - 2);
- cout << " " << colour(d.already_installed ? cl_unimportant : cl_tag,
+ cout << " " << colour(d.skip_install ? cl_unimportant : cl_tag,
"<" + tag_titles + ">");
}
@@ -582,7 +582,7 @@ namespace
deps.append(stringify(count - max_count + 1) + " more, ");
deps.erase(deps.length() - 2);
- cout << " " << colour(d.already_installed ? cl_unimportant : cl_tag,
+ cout << " " << colour(d.skip_install ? cl_unimportant : cl_tag,
"<" + deps + ">");
}
}
@@ -609,7 +609,7 @@ namespace
"--install --preserve-world";
for (DepList::Iterator i(task.current_dep_list_entry()), i_end(task.dep_list().end()) ;
i != i_end ; ++i)
- if (! i->already_installed)
+ if (! i->skip_install)
cerr << " =" << i->package.name << "-" << i->package.version << "::" << i->package.repository;
cerr << endl;
}