Remove assumption that --yes must be used only in --force mode

This is not only undocumented but is is also in violation with --help
documentation.

Using --yes without --force is useful in pvcreate when it detects
old signature.

diff --git a/WHATS_NEW b/WHATS_NEW
index 1a16f7b174a808bfb240997889cf4b917b5e7e50..22dc071944a5b475edcf3eb4f19c337936102f69 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,6 +1,7 @@
 Version 2.02.74 - 
 ==================================
   Simplify MD/swap signature detection in pvcreate and allow aborting.
+  Remove assumption that --yes must be used only in --force mode.
 
 Version 2.02.73 - 18th August 2010
 ==================================

diff --git a/tools/pvremove.c b/tools/pvremove.c
index 8242993cbbd7abdd3a3c389875e3e158afec9145..c57df64c6c1204e0b5f5a48c18c49b133c48ebe8 100644 (file)
--- a/tools/pvremove.c
+++ b/tools/pvremove.c
@@ -143,11 +143,6 @@ int pvremove(struct cmd_context *cmd, int argc, char **argv)
                return EINVALID_CMD_LINE;
        }
 
-       if (arg_count(cmd, yes_ARG) && !arg_count(cmd, force_ARG)) {
-               log_error("Option y can only be given with option f");
-               return EINVALID_CMD_LINE;
-       }
-
        for (i = 0; i < argc; i++) {
                r = pvremove_single(cmd, argv[i], NULL);
                if (r > ret)

diff --git a/tools/toollib.c b/tools/toollib.c
index bdb52d5714c8444ad456773986bef471c0bfb7c5..5da30f46b65a75ce5925b04c08630fca29514032 100644 (file)
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -1344,11 +1344,6 @@ int pvcreate_params_validate(struct cmd_context *cmd,
                return 0;
        }
 
-       if (arg_count(cmd, yes_ARG) && !arg_count(cmd, force_ARG)) {
-               log_error("Option y can only be given with option f");
-               return 0;
-       }
-
        pp->yes = arg_count(cmd, yes_ARG);
        pp->force = arg_count(cmd, force_ARG);