aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-10-27 20:33:12 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-10-27 20:33:12 +0000
commit1bea7526f6ef04ab85cdc425a161d3af0a7ce5d2 (patch)
tree518461afce0976a56e1e93dc0cb59c7a00b40e43
parentecd5d1acd291c12fae455af07beee30dc8bdfe71 (diff)
downloadpaludis-1bea7526f6ef04ab85cdc425a161d3af0a7ce5d2.tar.gz
paludis-1bea7526f6ef04ab85cdc425a161d3af0a7ce5d2.tar.xz
Remove -S / --show-slot option for --query. Always show slots.
-rw-r--r--src/paludis/command_line.cc1
-rw-r--r--src/paludis/command_line.hh3
-rw-r--r--src/paludis/query.cc19
3 files changed, 8 insertions, 15 deletions
diff --git a/src/paludis/command_line.cc b/src/paludis/command_line.cc
index ea805d5..789fbd6 100644
--- a/src/paludis/command_line.cc
+++ b/src/paludis/command_line.cc
@@ -67,7 +67,6 @@ CommandLine::CommandLine() :
query_args(this, "Query options",
"Options which are relevant for --query."),
- a_show_slot(&query_args, "show-slot", 'S', "Show SLOTs"),
a_show_deps(&query_args, "show-deps", 'D', "Show dependencies"),
a_show_metadata(&query_args, "show-metadata", 'M', "Show raw metadata"),
diff --git a/src/paludis/command_line.hh b/src/paludis/command_line.hh
index 6171ae4..3aab733 100644
--- a/src/paludis/command_line.hh
+++ b/src/paludis/command_line.hh
@@ -153,9 +153,6 @@ class CommandLine :
/// Query arguments.
paludis::args::ArgsGroup query_args;
- /// --show-slot
- paludis::args::SwitchArg a_show_slot;
-
/// --show-deps
paludis::args::SwitchArg a_show_deps;
diff --git a/src/paludis/query.cc b/src/paludis/query.cc
index 96e27cd..97072b4 100644
--- a/src/paludis/query.cc
+++ b/src/paludis/query.cc
@@ -93,16 +93,14 @@ void do_one_package_query(
VersionMetadata::ConstPointer metadata(env->package_database()->fetch_repository(
e->repository)->version_metadata(e->name,
e->version));
- if (CommandLine::get_instance()->a_show_slot.specified())
- {
- /* show the slot, if we're about to move onto a new slot */
- std::string slot_name(stringify(metadata->slot));
- if (old_slot.empty())
- old_slot = slot_name;
- else if (old_slot != slot_name)
- cout << colour(cl_slot, "{:" + old_slot + "} ");
+
+ /* show the slot, if we're about to move onto a new slot */
+ std::string slot_name(stringify(metadata->slot));
+ if (old_slot.empty())
old_slot = slot_name;
- }
+ else if (old_slot != slot_name)
+ cout << colour(cl_slot, "{:" + old_slot + "} ");
+ old_slot = slot_name;
const MaskReasons masks(env->mask_reasons(*e));
@@ -155,8 +153,7 @@ void do_one_package_query(
}
/* still need to show the slot for the last item */
- if (CommandLine::get_instance()->a_show_slot.specified())
- cout << colour(cl_slot, "{:" + old_slot + "} ");
+ cout << colour(cl_slot, "{:" + old_slot + "} ");
cout << endl;
}