aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 21:16:56 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-12-05 21:16:56 +0000
commit92ce5fe051a098e9cd75c99ae241f234b13d7613 (patch)
treee26736f509dfbc5db029cf66ebf761b6d7126f7f
parent41cf92aa39958d70cb305a2b7ffb62a3eaacfe3d (diff)
downloadpaludis-92ce5fe051a098e9cd75c99ae241f234b13d7613.tar.gz
paludis-92ce5fe051a098e9cd75c99ae241f234b13d7613.tar.xz
Nuke deprecated command line options
-rw-r--r--src/clients/inquisitio/command_line.cc8
-rw-r--r--src/clients/inquisitio/command_line.hh10
-rw-r--r--src/clients/inquisitio/inquisitio.cc13
-rw-r--r--src/clients/paludis/command_line.cc20
-rw-r--r--src/clients/paludis/command_line.hh16
-rwxr-xr-xsrc/clients/paludis/exception_TEST2
-rw-r--r--src/clients/paludis/paludis.cc79
7 files changed, 8 insertions, 140 deletions
diff --git a/src/clients/inquisitio/command_line.cc b/src/clients/inquisitio/command_line.cc
index dbea034..d229ec2 100644
--- a/src/clients/inquisitio/command_line.cc
+++ b/src/clients/inquisitio/command_line.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -80,11 +80,7 @@ CommandLine::CommandLine() :
a_compact(&output_args, "compact", '\0', "Display output using one line per entry", true),
a_show_dependencies(&output_args, "show-dependencies", 'D', "Show dependencies", true),
a_show_authors(&output_args, "show-authors", 'A', "Show author information", true),
- a_show_metadata(&output_args, "show-metadata", 'M', "Show raw metadata", true),
-
- deprecated_args(this, "Deprecated options", "Deprecated options."),
- a_config_suffix(&deprecated_args, "config-suffix", 'c',
- "Replaced by --environment")
+ a_show_metadata(&output_args, "show-metadata", 'M', "Show raw metadata", true)
{
add_usage_line("[ --search ] [search options] pattern ...");
add_usage_line("--help");
diff --git a/src/clients/inquisitio/command_line.hh b/src/clients/inquisitio/command_line.hh
index 657c298..06e6066 100644
--- a/src/clients/inquisitio/command_line.hh
+++ b/src/clients/inquisitio/command_line.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007 Ciaran McCreesh
+ * Copyright (c) 2007, 2008 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -102,14 +102,6 @@ class CommandLine :
paludis::args::SwitchArg a_show_metadata;
///\}
-
- ///\name Deprecated arguments
- ///\{
-
- paludis::args::ArgsGroup deprecated_args;
- paludis::args::StringArg a_config_suffix;
-
- ///\}
};
diff --git a/src/clients/inquisitio/inquisitio.cc b/src/clients/inquisitio/inquisitio.cc
index 6cec436..e1476d0 100644
--- a/src/clients/inquisitio/inquisitio.cc
+++ b/src/clients/inquisitio/inquisitio.cc
@@ -88,19 +88,10 @@ main(int argc, char *argv[])
throw args::DoHelp("you should specify exactly one action");
std::string paludis_command(argv[0]), env_spec;
- if (CommandLine::get_instance()->a_config_suffix.specified())
- {
- Log::get_instance()->message("inquisitio.command_line.deprecated", ll_warning, lc_no_context)
- << "--config-suffix is deprecated, use --environment ':" <<
- CommandLine::get_instance()->a_config_suffix.argument() << "'";
- env_spec = ":" + CommandLine::get_instance()->a_config_suffix.argument();
- paludis_command.append(" --" + CommandLine::get_instance()->a_config_suffix.long_name() + " " +
- CommandLine::get_instance()->a_config_suffix.argument());
- }
- else if (CommandLine::get_instance()->a_environment.specified())
+ if (CommandLine::get_instance()->a_environment.specified())
{
paludis_command.append(" --" + CommandLine::get_instance()->a_environment.long_name() + " " +
- CommandLine::get_instance()->a_config_suffix.argument());
+ CommandLine::get_instance()->a_environment.argument());
env_spec = CommandLine::get_instance()->a_environment.argument();
}
diff --git a/src/clients/paludis/command_line.cc b/src/clients/paludis/command_line.cc
index f71889e..195261f 100644
--- a/src/clients/paludis/command_line.cc
+++ b/src/clients/paludis/command_line.cc
@@ -118,25 +118,7 @@ CommandLine::CommandLine() :
owner_args(this, "Owner options",
"Options relevant for the --owner actions."),
- a_full_match(&owner_args, "full-match", '\0', "Match whole filename", true),
-
- deprecated_args(this, "Deprecated options", "Deprecated options."),
- a_dl_no_unnecessary_upgrades(&deprecated_args, "dl-no-unnecessary-upgrades", 'U',
- "Replaced by --dl-upgrade as-needed", false),
- a_dl_drop_all(&deprecated_args, "dl-drop-all", '0',
- "Replaced by --dl-deps-default discard", false),
- a_dl_ignore_installed(&deprecated_args, "dl-ignore-installed", 'e',
- "Replaced by --dl-reinstall always", false),
- a_show_install_reasons(&deprecated_args, "show-install-reasons",
- '\0', "Replaced by --show-reasons", false),
- a_add_to_world_atom(&deprecated_args, "add-to-world-atom", '\0',
- "Replaced by --add-to-world-spec", false),
- a_config_suffix(&deprecated_args, "config-suffix", 'c',
- "Replaced by --environment", false),
- a_update_news(&deprecated_args, "update-news", '\0',
- "No longer useful, does nothing", false),
- a_safe_resume(&deprecated_args, "safe-resume", '\0',
- "Now default behaviour, use --no-safe-resume to disable", false)
+ a_full_match(&owner_args, "full-match", '\0', "Match whole filename", true)
{
add_usage_line("--query [query options] target ...");
add_usage_line("--install [install options] target ...");
diff --git a/src/clients/paludis/command_line.hh b/src/clients/paludis/command_line.hh
index ca0fd9c..2b895f1 100644
--- a/src/clients/paludis/command_line.hh
+++ b/src/clients/paludis/command_line.hh
@@ -254,22 +254,6 @@ class CommandLine :
paludis::args::SwitchArg a_full_match;
/// }
-
-
- /// \name Deprecated arguments
- ///\{
-
- paludis::args::ArgsGroup deprecated_args;
- paludis::args::SwitchArg a_dl_no_unnecessary_upgrades;
- paludis::args::SwitchArg a_dl_drop_all;
- paludis::args::SwitchArg a_dl_ignore_installed;
- paludis::args::StringArg a_show_install_reasons;
- paludis::args::StringArg a_add_to_world_atom;
- paludis::args::StringArg a_config_suffix;
- paludis::args::SwitchArg a_update_news;
- paludis::args::SwitchArg a_safe_resume;
-
- ///\}
};
#endif
diff --git a/src/clients/paludis/exception_TEST b/src/clients/paludis/exception_TEST
index c3334ec..06703e5 100755
--- a/src/clients/paludis/exception_TEST
+++ b/src/clients/paludis/exception_TEST
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
PALUDIS_HOME=./ \
- ./paludis --config-suffix paludis-build-test -pi asdf 2>&1 \
+ ./paludis --environment :paludis-build-test -pi asdf 2>&1 \
| grep 'configuration error' >/dev/null
diff --git a/src/clients/paludis/paludis.cc b/src/clients/paludis/paludis.cc
index 053e03d..561f4c0 100644
--- a/src/clients/paludis/paludis.cc
+++ b/src/clients/paludis/paludis.cc
@@ -110,65 +110,6 @@ main(int argc, char *argv[])
Log::get_instance()->set_program_name(argv[0]);
- /* deprecated args */
- if (CommandLine::get_instance()->a_dl_no_unnecessary_upgrades.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "--dl-no-unnecessary-upgrades / -U is deprecated";
- CommandLine::get_instance()->dl_args.dl_upgrade.set_argument("as-needed");
- CommandLine::get_instance()->dl_args.dl_upgrade.set_specified(true);
- }
-
- if (CommandLine::get_instance()->a_dl_drop_all.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "--dl-drop-all / -0 is deprecated";
- CommandLine::get_instance()->dl_args.dl_installed_deps_pre.set_argument("discard");
- CommandLine::get_instance()->dl_args.dl_installed_deps_pre.set_specified(true);
- CommandLine::get_instance()->dl_args.dl_installed_deps_post.set_argument("discard");
- CommandLine::get_instance()->dl_args.dl_installed_deps_post.set_specified(true);
- CommandLine::get_instance()->dl_args.dl_installed_deps_runtime.set_argument("discard");
- CommandLine::get_instance()->dl_args.dl_installed_deps_runtime.set_specified(true);
- CommandLine::get_instance()->dl_args.dl_uninstalled_deps_pre.set_argument("discard");
- CommandLine::get_instance()->dl_args.dl_uninstalled_deps_pre.set_specified(true);
- CommandLine::get_instance()->dl_args.dl_uninstalled_deps_post.set_argument("discard");
- CommandLine::get_instance()->dl_args.dl_uninstalled_deps_post.set_specified(true);
- CommandLine::get_instance()->dl_args.dl_uninstalled_deps_runtime.set_argument("discard");
- CommandLine::get_instance()->dl_args.dl_uninstalled_deps_runtime.set_specified(true);
- }
-
- if (CommandLine::get_instance()->a_dl_ignore_installed.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "--dl-ignore-installed / -e is deprecated";
- CommandLine::get_instance()->dl_args.dl_reinstall.set_argument("always");
- CommandLine::get_instance()->dl_args.dl_reinstall.set_specified(true);
- }
-
- if (CommandLine::get_instance()->a_show_install_reasons.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "--show-install-reasons is deprecated, use --show-reasons";
- CommandLine::get_instance()->install_args.a_show_reasons.set_argument(
- CommandLine::get_instance()->a_show_install_reasons.argument());
- CommandLine::get_instance()->install_args.a_show_reasons.set_specified(true);
- }
-
- if (CommandLine::get_instance()->a_add_to_world_atom.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "--add-to-world-atom is deprecated, use --add-to-world-spec";
- CommandLine::get_instance()->install_args.a_add_to_world_spec.set_argument(
- CommandLine::get_instance()->a_add_to_world_atom.argument());
- CommandLine::get_instance()->install_args.a_add_to_world_spec.set_specified(true);
- }
-
- if (CommandLine::get_instance()->a_safe_resume.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "Safe resume support is now enabled by default; there is no need to pass --safe-resume";
- }
-
/* need an action */
if (1 != (CommandLine::get_instance()->a_query.specified() +
CommandLine::get_instance()->a_version.specified() +
@@ -188,7 +129,6 @@ main(int argc, char *argv[])
CommandLine::get_instance()->a_owner.specified() +
CommandLine::get_instance()->a_config.specified() +
CommandLine::get_instance()->a_has_version.specified() +
- CommandLine::get_instance()->a_update_news.specified() +
CommandLine::get_instance()->a_regenerate_installed_cache.specified() +
CommandLine::get_instance()->a_regenerate_installable_cache.specified() +
CommandLine::get_instance()->a_environment_variable.specified() +
@@ -213,17 +153,7 @@ main(int argc, char *argv[])
std::string paludis_command(argv[0]), env_spec;
- if (CommandLine::get_instance()->a_config_suffix.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "--config-suffix is deprecated, use --environment ':" <<
- CommandLine::get_instance()->a_config_suffix.argument() << "'";
-
- env_spec = ":" + CommandLine::get_instance()->a_config_suffix.argument();
- paludis_command.append(" --" + CommandLine::get_instance()->a_config_suffix.long_name() + " " +
- CommandLine::get_instance()->a_config_suffix.argument());
- }
- else if (CommandLine::get_instance()->a_environment.specified())
+ if (CommandLine::get_instance()->a_environment.specified())
{
env_spec = CommandLine::get_instance()->a_environment.argument();
paludis_command.append(" --" + CommandLine::get_instance()->a_environment.long_name() + " " +
@@ -415,13 +345,6 @@ main(int argc, char *argv[])
return do_configuration_variable(env);
}
- if (CommandLine::get_instance()->a_update_news.specified())
- {
- Log::get_instance()->message("paludis.command_line.deprecated", ll_warning, lc_no_context)
- << "Calling --update-news is no longer useful or necessary";
- return EXIT_SUCCESS;
- }
-
if (CommandLine::get_instance()->a_regenerate_installed_cache.specified() ||
CommandLine::get_instance()->a_regenerate_installable_cache.specified())
{