aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Elias Pipping <elias@pipping.org> 2010-03-25 15:24:54 +0100
committerAvatar Ingmar Vanhassel <ingmar@exherbo.org> 2010-03-25 15:37:39 +0100
commitc2b7e3e43575ec52a9ce44e6aeef33fda62ef2d4 (patch)
treea405c3d4a138168aab2fbfcec967482bd958e67a
parent83616e1eb920eefb8d74141b9b6dc7fad140e519 (diff)
downloadpaludis-c2b7e3e43575ec52a9ce44e6aeef33fda62ef2d4.tar.gz
paludis-c2b7e3e43575ec52a9ce44e6aeef33fda62ef2d4.tar.xz
Rename --permit-any-version option to --permit-old-version
-rw-r--r--bash-completion/cave2
-rw-r--r--src/clients/cave/cmd_display_resolution.cc2
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.cc2
-rw-r--r--src/clients/cave/cmd_resolve_cmdline.hh2
-rw-r--r--src/clients/cave/resolve_common.cc4
-rw-r--r--zsh-completion/_cave2
6 files changed, 7 insertions, 7 deletions
diff --git a/bash-completion/cave b/bash-completion/cave
index 800311a..ac0d7bc 100644
--- a/bash-completion/cave
+++ b/bash-completion/cave
@@ -102,7 +102,7 @@ __cave_resolve_options="-h --help
-e --everything --no-everything
-U --permit-uninstall
-d --permit-downgrade
- -a --permit-any-version
+ -o --permit-old-version
-K --keep-targets
-k --keep
-R --reinstall-scm
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 615af9f..57e8e40 100644
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -602,7 +602,7 @@ namespace
std::string visit(const NotBestConfirmation &) const
{
- return "--permit-any-version";
+ return "--permit-old-version";
}
};
diff --git a/src/clients/cave/cmd_resolve_cmdline.cc b/src/clients/cave/cmd_resolve_cmdline.cc
index fb58f39..c73dc44 100644
--- a/src/clients/cave/cmd_resolve_cmdline.cc
+++ b/src/clients/cave/cmd_resolve_cmdline.cc
@@ -63,7 +63,7 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
"and may suggest stupid and dangerous uninstalls."),
a_permit_downgrade(&g_resolution_options, "permit-downgrade", 'd', "Permit downgrades matching the supplied "
"specification. Use '*/*' to allow all downgrades."),
- a_permit_any_version(&g_resolution_options, "permit-any-version", 'a', "Permit installs of versions matching the supplied "
+ a_permit_old_version(&g_resolution_options, "permit-old-version", 'o', "Permit installs of versions matching the supplied "
"specification even if those versions are worse than the best visible version in the slot. Use '*/*' "
"to allow all worse versions to be installed."),
// a_purge(&g_resolution_options, "purge", 'P',
diff --git a/src/clients/cave/cmd_resolve_cmdline.hh b/src/clients/cave/cmd_resolve_cmdline.hh
index ec35856..d0c0f17 100644
--- a/src/clients/cave/cmd_resolve_cmdline.hh
+++ b/src/clients/cave/cmd_resolve_cmdline.hh
@@ -45,7 +45,7 @@ namespace paludis
// args::SwitchArg a_permit_older_slot_uninstalls;
args::StringSetArg a_permit_uninstall;
args::StringSetArg a_permit_downgrade;
- args::StringSetArg a_permit_any_version;
+ args::StringSetArg a_permit_old_version;
// args::StringSetArg a_purge;
args::ArgsGroup g_dependent_options;
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index 69c3423..20e1d1f 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -1183,8 +1183,8 @@ namespace
bool visit(const NotBestConfirmation &) const
{
if (id)
- for (args::StringSetArg::ConstIterator a(resolution_options.a_permit_any_version.begin_args()),
- a_end(resolution_options.a_permit_any_version.end_args()) ;
+ for (args::StringSetArg::ConstIterator a(resolution_options.a_permit_old_version.begin_args()),
+ a_end(resolution_options.a_permit_old_version.end_args()) ;
a != a_end ; ++a)
{
PackageDepSpec spec(parse_user_package_dep_spec(*a, env, UserPackageDepSpecOptions() + updso_allow_wildcards));
diff --git a/zsh-completion/_cave b/zsh-completion/_cave
index 0b220e1..28f6955 100644
--- a/zsh-completion/_cave
+++ b/zsh-completion/_cave
@@ -289,7 +289,7 @@ _cave_cmd_resolve()
'(--explain -X)'{--explain,-X}'[Explain why decisions are made]:Spec: ' \
'*'{--permit-uninstall,-U}'[Permit uninstallation of packages matching a package spec]:Spec: ' \
'*'{--permit-downgrade,-d}'[Permit downgrades of packages matching a package spec]:Spec: ' \
- '*'{--permit-any-version,-e}'[Permit installs of versions worse than the best visible version in the slot for packages matching a package spec]:Spec: ' \
+ '*'{--permit-old-version,-o}'[Permit installs of versions worse than the best visible version in the slot for packages matching a package spec]:Spec: ' \
'*'{--uninstalls-may-break,-u}'[Permit uninstalls that might break packages matching the specified package spec]:Spec: ' \
'*'{--remove-if-dependent,-r}'[Remove dependent packages that might be broken by other changes if those packages match a package spec]:Spec: ' \
'*'{--less-restrictive-remove-blockers,-l}'[Use less restrictive blockers for packages matching the supplied package spec]:Spec: ' \