aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 17:30:53 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-06-11 19:13:23 +0100
commit7ce202f0c9f10ea545daf9ed919d969e8ef19bdc (patch)
tree063e59b29b815e1940663d5fd6a6e8cfa7dbc34e /src
parent91cb1ee0418b3a6d90643cc51d59f7204f5b4995 (diff)
downloadpaludis-7ce202f0c9f10ea545daf9ed919d969e8ef19bdc.tar.gz
paludis-7ce202f0c9f10ea545daf9ed919d969e8ef19bdc.tar.xz
Add but do not implement keep if-same-metadata
Diffstat (limited to 'src')
-rwxr-xr-xsrc/clients/cave/cmd_display_resolution.cc3
-rw-r--r--src/clients/cave/resolve_cmdline.cc6
-rw-r--r--src/clients/cave/resolve_common.cc2
3 files changed, 11 insertions, 0 deletions
diff --git a/src/clients/cave/cmd_display_resolution.cc b/src/clients/cave/cmd_display_resolution.cc
index 16182dd7b..78317943a 100755
--- a/src/clients/cave/cmd_display_resolution.cc
+++ b/src/clients/cave/cmd_display_resolution.cc
@@ -354,6 +354,9 @@ namespace
case ue_only_if_transient:
result << ", using existing only if transient";
break;
+ case ue_if_same_metadata:
+ result << ", use existing if same metadata";
+ break;
case ue_if_same_version:
result << ", use existing if same version";
break;
diff --git a/src/clients/cave/resolve_cmdline.cc b/src/clients/cave/resolve_cmdline.cc
index 90252b065..ba9cc8f9a 100644
--- a/src/clients/cave/resolve_cmdline.cc
+++ b/src/clients/cave/resolve_cmdline.cc
@@ -118,6 +118,9 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
("never", 'n', "Never")
("if-transient", 't', "Only if the installed package is transient "
"(e.g. from 'cave import')")
+ ("if-same-metadata", 'm', "If it is the same as the proposed replacement (that is, if it has the same "
+ "version, and no non-special use flags or choices have had their values changed), and if significant "
+ "metadata has not been modified")
("if-same", 's', "If it is the same as the proposed replacement (that is, if it has the same "
"version, and no non-special use flags or choices have had their values changed)")
("if-same-version", 'v', "If it is the same version as the proposed replacement")
@@ -131,6 +134,9 @@ ResolveCommandLineResolutionOptions::ResolveCommandLineResolutionOptions(args::A
("never", 'n', "Never")
("if-transient", 't', "Only if the installed package is transient "
"(e.g. from 'cave import') (default if --everything)")
+ ("if-same-metadata", 'm', "If it is the same as the proposed replacement (that is, if it has the same "
+ "version, and no non-special use flags or choices have had their values changed), and if significant "
+ "metadata has not been modified")
("if-same", 's', "If it is the same as the proposed replacement (that is, if it has the same "
"version, and no non-special use flags or choices have had their values changed) (default if --complete)")
("if-same-version", 'v', "If it is the same version as the proposed replacement")
diff --git a/src/clients/cave/resolve_common.cc b/src/clients/cave/resolve_common.cc
index b095dfce5..f44858794 100644
--- a/src/clients/cave/resolve_common.cc
+++ b/src/clients/cave/resolve_common.cc
@@ -620,6 +620,8 @@ namespace
return ue_never;
else if (arg.argument() == "if-transient")
return ue_only_if_transient;
+ else if (arg.argument() == "if-same-metadata")
+ return ue_if_same_metadata;
else if (arg.argument() == "if-same")
return ue_if_same;
else if (arg.argument() == "if-same-version")