aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-04 01:14:59 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-04 01:14:59 +0000
commite5b65e52e728da6db6a45f12a3c39d67ea1aed54 (patch)
tree997aa64b56244ed5e3236a7edebcb51f3b9017f8
parenta1a15548d4c4e123910b4f3e892d47ebd4f91eed (diff)
downloadpaludis-e5b65e52e728da6db6a45f12a3c39d67ea1aed54.tar.gz
paludis-e5b65e52e728da6db6a45f12a3c39d67ea1aed54.tar.xz
--show-install-reasons is now --show-reasons
-rw-r--r--NEWS2
-rw-r--r--doc/faq.html.skel4
-rw-r--r--src/clients/contrarius/command_line.cc2
-rw-r--r--src/clients/contrarius/command_line.hh4
-rw-r--r--src/clients/contrarius/install.cc6
-rw-r--r--src/clients/paludis/command_line.cc8
-rw-r--r--src/clients/paludis/command_line.hh7
-rw-r--r--src/clients/paludis/install.cc10
-rw-r--r--src/clients/paludis/paludis.cc12
-rw-r--r--src/clients/paludis/uninstall.cc8
10 files changed, 40 insertions, 23 deletions
diff --git a/NEWS b/NEWS
index 32f0137..cf22baf 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ of every change, see the ChangeLog.
* Paludis now supports resuming of interrupted downloads. Consult the FAQ
for how to use this.
+ * --show-install-reasons is now called --show-reasons.
+
0.14.0:
* The merge and unmerge utilities are now called with an explicit path.
diff --git a/doc/faq.html.skel b/doc/faq.html.skel
index 9ed0853..31f977f 100644
--- a/doc/faq.html.skel
+++ b/doc/faq.html.skel
@@ -62,7 +62,7 @@ export CXX="/usr/lib/ccache/bin/g++"
<code>silent</code> in this way -- warnings are warnings because you need
to read them)</li>
- <li><code>--show-install-reasons summary</code></li>
+ <li><code>--show-reasons summary</code></li>
<li><code>--resume-command-template ~/.paludis-resume-XXXXXX</code></li>
@@ -291,7 +291,7 @@ restore it. You should be using <code>PROMPT_COMMAND</code> to do that yourself
<h3 id="tree">No <code>--tree</code> Equivalent</h3>
<p>Paludis does not have something identical to <code>emerge --tree</code>. It
-does, however, have <code>--show-install-reasons</code>, which we find to be
+does, however, have <code>--show-reasons</code>, which we find to be
considerably more informative, useful and correct.</p>
<h3 id="features">No <code>FEATURES</code> Equivalent</h3>
diff --git a/src/clients/contrarius/command_line.cc b/src/clients/contrarius/command_line.cc
index 42b3a6b..fd0f8e2 100644
--- a/src/clients/contrarius/command_line.cc
+++ b/src/clients/contrarius/command_line.cc
@@ -33,7 +33,7 @@ CommandLine::CommandLine() :
"Tweak toolchain creation."),
a_fetch(&build_args, "fetch", 'f', "Only fetch sources; don't install anything"),
a_pretend(&build_args, "pretend", 'p', "Pretend only"),
- a_show_install_reasons(&build_args, "show-install-reasons", '\0', "Show why packages are being installed",
+ a_show_reasons(&build_args, "show-reasons", '\0', "Show why packages are being installed",
paludis::args::EnumArg::EnumArgOptions
("none", "Don't show any information")
("summary", "Show a summary")
diff --git a/src/clients/contrarius/command_line.hh b/src/clients/contrarius/command_line.hh
index 7d77700..69b513d 100644
--- a/src/clients/contrarius/command_line.hh
+++ b/src/clients/contrarius/command_line.hh
@@ -57,8 +57,8 @@ class CommandLine :
/// --pretend
paludis::args::SwitchArg a_pretend;
- /// --show-install-reasons
- paludis::args::EnumArg a_show_install_reasons;
+ /// --show-reasons
+ paludis::args::EnumArg a_show_reasons;
/// --stage
paludis::args::EnumArg a_stage;
diff --git a/src/clients/contrarius/install.cc b/src/clients/contrarius/install.cc
index df4747c..c1df90d 100644
--- a/src/clients/contrarius/install.cc
+++ b/src/clients/contrarius/install.cc
@@ -59,7 +59,7 @@ namespace
virtual bool want_full_install_reasons() const
{
- return "full" == CommandLine::get_instance()->a_show_install_reasons.argument();
+ return "full" == CommandLine::get_instance()->a_show_reasons.argument();
}
virtual bool want_tags_summary() const
@@ -69,8 +69,8 @@ namespace
virtual bool want_install_reasons() const
{
- return "full" == CommandLine::get_instance()->a_show_install_reasons.argument() ||
- "summary" == CommandLine::get_instance()->a_show_install_reasons.argument();
+ return "full" == CommandLine::get_instance()->a_show_reasons.argument() ||
+ "summary" == CommandLine::get_instance()->a_show_reasons.argument();
}
virtual bool want_unchanged_use_flags() const
diff --git a/src/clients/paludis/command_line.cc b/src/clients/paludis/command_line.cc
index a478c46..ee6ff0a 100644
--- a/src/clients/paludis/command_line.cc
+++ b/src/clients/paludis/command_line.cc
@@ -84,7 +84,7 @@ CommandLine::CommandLine() :
a_debug_build(&install_args, "debug-build", '\0'),
a_fetch(&install_args, "fetch", 'f', "Only fetch sources; don't install anything"),
a_safe_resume(&install_args, "safe-resume", '\0', "Allow interrupted downloads to be resumed safely"),
- a_show_install_reasons(&install_args, "show-install-reasons", '\0', "Show why packages are being installed",
+ a_show_reasons(&install_args, "show-reasons", '\0', "Show why packages are being (un)installed",
args::EnumArg::EnumArgOptions
("none", "Don't show any information")
("summary", "Show a summary")
@@ -186,9 +186,11 @@ CommandLine::CommandLine() :
a_dl_no_unnecessary_upgrades(&deprecated_args, "dl-no-unnecessary-upgrades", 'U',
"Replaced by --dl-upgrade as-needed"),
a_dl_drop_all(&deprecated_args, "dl-drop-all", '0',
- "Drop all dependencies"),
+ "Replaced by --dl-deps-default discard"),
a_dl_ignore_installed(&deprecated_args, "dl-ignore-installed", 'e',
- "Replaced by --dl-reinstall always")
+ "Replaced by --dl-reinstall always"),
+ a_show_install_reasons(&deprecated_args, "show-install-reasons",
+ '\0', "Replaced by --show-reasons")
{
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 c02efa0..14ce7a5 100644
--- a/src/clients/paludis/command_line.hh
+++ b/src/clients/paludis/command_line.hh
@@ -206,8 +206,8 @@ class CommandLine :
/// --safe-resume
paludis::args::SwitchArg a_safe_resume;
- /// --show-install-reasons
- paludis::args::EnumArg a_show_install_reasons;
+ /// --show-reasons
+ paludis::args::EnumArg a_show_reasons;
/// --show-use-descriptions
paludis::args::EnumArg a_show_use_descriptions;
@@ -296,6 +296,9 @@ class CommandLine :
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;
+
+ ///\}
};
#endif
diff --git a/src/clients/paludis/install.cc b/src/clients/paludis/install.cc
index 0fcab32..b1e716a 100644
--- a/src/clients/paludis/install.cc
+++ b/src/clients/paludis/install.cc
@@ -148,7 +148,7 @@ namespace
virtual bool want_full_install_reasons() const
{
- return "full" == CommandLine::get_instance()->a_show_install_reasons.argument();
+ return "full" == CommandLine::get_instance()->a_show_reasons.argument();
}
virtual bool want_tags_summary() const
@@ -161,8 +161,8 @@ namespace
if (! CommandLine::get_instance()->a_pretend.specified())
return false;
- return "full" == CommandLine::get_instance()->a_show_install_reasons.argument() ||
- "summary" == CommandLine::get_instance()->a_show_install_reasons.argument();
+ return "full" == CommandLine::get_instance()->a_show_reasons.argument() ||
+ "summary" == CommandLine::get_instance()->a_show_reasons.argument();
}
virtual bool want_unchanged_use_flags() const
@@ -378,8 +378,8 @@ do_install()
options.uninstalled_deps_post = enum_arg_to_dep_list_deps_option(
CommandLine::get_instance()->dl_uninstalled_deps_post);
- if ((CommandLine::get_instance()->a_show_install_reasons.argument() == "summary") ||
- (CommandLine::get_instance()->a_show_install_reasons.argument() == "full"))
+ if ((CommandLine::get_instance()->a_show_reasons.argument() == "summary") ||
+ (CommandLine::get_instance()->a_show_reasons.argument() == "full"))
options.dependency_tags = true;
OurInstallTask task(options);
diff --git a/src/clients/paludis/paludis.cc b/src/clients/paludis/paludis.cc
index 50ab6a2..45da942 100644
--- a/src/clients/paludis/paludis.cc
+++ b/src/clients/paludis/paludis.cc
@@ -162,6 +162,7 @@ main(int argc, char *argv[])
CommandLine::get_instance()->dl_upgrade.set_argument("as-needed");
CommandLine::get_instance()->dl_upgrade.set_specified(true);
}
+
if (CommandLine::get_instance()->a_dl_drop_all.specified())
{
Log::get_instance()->message(ll_warning, lc_no_context, "--dl-drop-all / -0 is deprecated");
@@ -178,11 +179,20 @@ main(int argc, char *argv[])
CommandLine::get_instance()->dl_uninstalled_deps_runtime.set_argument("discard");
CommandLine::get_instance()->dl_uninstalled_deps_runtime.set_specified(true);
}
+
if (CommandLine::get_instance()->a_dl_ignore_installed.specified())
{
Log::get_instance()->message(ll_warning, lc_no_context, "--dl-ignore-installed / -e is deprecated");
CommandLine::get_instance()->dl_reinstall.set_argument("always");
- CommandLine::get_instance()->dl_reinstall.set_specified("always");
+ CommandLine::get_instance()->dl_reinstall.set_specified(true);
+ }
+
+ if (CommandLine::get_instance()->a_show_install_reasons.specified())
+ {
+ Log::get_instance()->message(ll_warning, lc_no_context, "--show-install-reasons is deprecated, use --show-reasons");
+ CommandLine::get_instance()->a_show_reasons.set_argument(
+ CommandLine::get_instance()->a_show_install_reasons.argument());
+ CommandLine::get_instance()->a_show_reasons.set_specified(true);
}
/* need an action */
diff --git a/src/clients/paludis/uninstall.cc b/src/clients/paludis/uninstall.cc
index 186d710..ae358ae 100644
--- a/src/clients/paludis/uninstall.cc
+++ b/src/clients/paludis/uninstall.cc
@@ -78,18 +78,18 @@ namespace
virtual void on_display_unmerge_list_entry(const UninstallListEntry & d)
{
if (d.skip_uninstall)
- if (CommandLine::get_instance()->a_show_install_reasons.argument() != "full")
+ if (CommandLine::get_instance()->a_show_reasons.argument() != "full")
return;
cout << "* " << colour(d.skip_uninstall ? cl_unimportant : cl_package_name, stringify(d.package));
++_count;
- if ((CommandLine::get_instance()->a_show_install_reasons.argument() == "summary") ||
- (CommandLine::get_instance()->a_show_install_reasons.argument() == "full"))
+ if ((CommandLine::get_instance()->a_show_reasons.argument() == "summary") ||
+ (CommandLine::get_instance()->a_show_reasons.argument() == "full"))
{
std::string deps;
unsigned count(0), max_count;
- if (CommandLine::get_instance()->a_show_install_reasons.argument() == "summary")
+ if (CommandLine::get_instance()->a_show_reasons.argument() == "summary")
max_count = 3;
else
max_count = std::numeric_limits<long>::max();