diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-06-12 01:11:43 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-06-12 01:12:11 +0100 |
| commit | 0c9893ceeca308897238e4c2190607d570f7feba (patch) | |
| tree | 9c705b1f4bb1ece4790f3f547e993f4d72e8cd0f /src | |
| parent | 8653241b4e943999757f30451f24a2ccc8d9862c (diff) | |
| download | paludis-0c9893ceeca308897238e4c2190607d570f7feba.tar.gz paludis-0c9893ceeca308897238e4c2190607d570f7feba.tar.xz | |
Kill AssociationMask
Diffstat (limited to 'src')
| -rwxr-xr-x | src/clients/cave/cmd_display_resolution.cc | 6 | ||||
| -rw-r--r-- | src/clients/cave/cmd_print_id_masks.cc | 5 | ||||
| -rw-r--r-- | src/clients/cave/cmd_print_ids.cc | 11 | ||||
| -rw-r--r-- | src/clients/cave/cmd_show.cc | 13 |
4 files changed, 0 insertions, 35 deletions
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc index 09abb2d4c..31c074a8d 100755 --- a/src/clients/cave/cmd_display_resolution.cc +++ b/src/clients/cave/cmd_display_resolution.cc @@ -1039,12 +1039,6 @@ namespace { cout << fuc(fs_masked_by_explanation(), fv<'i'>(indent), fv<'c'>(colour), fv<'d'>(m.description()), fv<'x'>(m.explanation())); } - - void visit(const AssociationMask & m) const - { - cout << fuc(fs_masked_by_explanation(), fv<'i'>(indent), fv<'c'>(colour), fv<'d'>(m.description()), - fv<'x'>("associated package '" + stringify(m.associated_package_spec()) + "'")); - } }; void display_masks( diff --git a/src/clients/cave/cmd_print_id_masks.cc b/src/clients/cave/cmd_print_id_masks.cc index b3d026011..4cc9227f6 100644 --- a/src/clients/cave/cmd_print_id_masks.cc +++ b/src/clients/cave/cmd_print_id_masks.cc @@ -122,11 +122,6 @@ namespace { return std::make_pair("", ""); } - - const std::pair<std::string, std::string> visit(const AssociationMask & m) const - { - return std::make_pair("", stringify(m.associated_package_spec())); - } }; void do_one_mask( diff --git a/src/clients/cave/cmd_print_ids.cc b/src/clients/cave/cmd_print_ids.cc index 5be52940c..0c96c5d52 100644 --- a/src/clients/cave/cmd_print_ids.cc +++ b/src/clients/cave/cmd_print_ids.cc @@ -105,7 +105,6 @@ namespace ("unaccepted", "masked by unaccepted key") ("repository", "masked by repository") ("unsupported", "masked because it is unsupported") - ("association", "masked by association") ), g_display_options(main_options_section(), "Display Options", "Controls the output format."), a_format(&g_display_options, "format", 'f', "Select the output format. Special tokens recognised are " @@ -223,16 +222,6 @@ namespace break; } } - else if (mask == "association") - { - for (PackageID::MasksConstIterator m((*i)->begin_masks()), m_end((*i)->end_masks()) ; - m != m_end ; ++m) - if (visitor_cast<const AssociationMask>(**m)) - { - result->insert(*i); - break; - } - } else throw args::DoHelp("Unknown --" + cmdline.a_with_mask.long_name() + " value '" + mask + "'"); } diff --git a/src/clients/cave/cmd_show.cc b/src/clients/cave/cmd_show.cc index 8f1c3dcda..7cdd05427 100644 --- a/src/clients/cave/cmd_show.cc +++ b/src/clients/cave/cmd_show.cc @@ -1053,19 +1053,6 @@ namespace ); } - void visit(const AssociationMask & m) - { - out << fuc( - (cmdline.a_raw_names.specified() ? fs_mask_value_raw() : fs_mask_value_human()), - fv<'s'>(cmdline.a_raw_names.specified() ? stringify(m.key()) : "by " + m.description()), - fv<'v'>(stringify(m.associated_package_spec())), - fv<'t'>(""), - fv<'i'>(std::string(indent, ' ')), - fv<'b'>(""), - fv<'p'>("") - ); - } - void visit(const UserMask & m) { out << fuc( |