aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-12 13:56:44 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-04-12 13:56:44 +0000
commitfedcaf434a0ad8a9e191e39f99f810a031299c47 (patch)
tree237097422cb05d7bfc19ff7d659cbceb30159fa8
parent29732b3d9bd74f14b441ba5a38493431b90da4cf (diff)
downloadpaludis-fedcaf434a0ad8a9e191e39f99f810a031299c47.tar.gz
paludis-fedcaf434a0ad8a9e191e39f99f810a031299c47.tar.xz
Always show licences on query
-rw-r--r--src/command_line.cc2
-rw-r--r--src/command_line.hh6
-rw-r--r--src/query.cc7
3 files changed, 3 insertions, 12 deletions
diff --git a/src/command_line.cc b/src/command_line.cc
index aa765b9..2f30a81 100644
--- a/src/command_line.cc
+++ b/src/command_line.cc
@@ -50,8 +50,6 @@ CommandLine::CommandLine() :
query_args(this, "Query options"),
a_show_slot(&query_args, "show-slot", 'S', "Show SLOTs"),
- a_show_license(&query_args, "show-license", 'L', "Show licenses"),
- a_show_licence(&a_show_license, "show-licence"),
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/command_line.hh b/src/command_line.hh
index aaa42c9..93a7af0 100644
--- a/src/command_line.hh
+++ b/src/command_line.hh
@@ -120,12 +120,6 @@ class CommandLine :
/// --show-slot
paludis::args::SwitchArg a_show_slot;
- /// --show-license
- paludis::args::SwitchArg a_show_license;
-
- /// --show-licence
- paludis::args::AliasArg a_show_licence;
-
/// --show-deps
paludis::args::SwitchArg a_show_deps;
diff --git a/src/query.cc b/src/query.cc
index 9958d1d..c43475e 100644
--- a/src/query.cc
+++ b/src/query.cc
@@ -162,10 +162,9 @@ void do_one_query(
cout << " " << std::setw(22) << std::left << "Description:" << std::setw(0) <<
" " << metadata->get(p::vmk_description) << endl;
- if (CommandLine::get_instance()->a_show_license.specified())
- if (! metadata->get(p::vmk_license).empty())
- cout << " " << std::setw(22) << std::left << "License:" << std::setw(0) <<
- " " << metadata->get(p::vmk_license) << endl;
+ if (! metadata->get(p::vmk_license).empty())
+ cout << " " << std::setw(22) << std::left << "License:" << std::setw(0) <<
+ " " << metadata->get(p::vmk_license) << endl;
if (CommandLine::get_instance()->a_show_deps.specified())
{