diff options
| author | Alasdair Kergon <agk@redhat.com> | 2008-06-03 17:48:13 +0000 |
|---|---|---|
| committer | Alasdair Kergon <agk@redhat.com> | 2008-06-03 17:48:13 +0000 |
| commit | 50fd61eb8dd4896833cd88fbf2e6e7419dd8e171 (patch) | |
| tree | ae23afd0fd9dee1041d410a6a51c62ec81836738 /tools | |
| parent | b2d6cb06c576e7a6365a52789f4d823372d89b3b (diff) | |
| download | lvm2-50fd61eb8dd4896833cd88fbf2e6e7419dd8e171.tar.gz lvm2-50fd61eb8dd4896833cd88fbf2e6e7419dd8e171.tar.xz lvm2-50fd61eb8dd4896833cd88fbf2e6e7419dd8e171.zip | |
suppress warning on silent failure with ECMD_PROCESSED
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lvm.c | 2 | ||||
| -rw-r--r-- | tools/lvmcmdline.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/lvm.c b/tools/lvm.c index 04eaf681..3576515d 100644 --- a/tools/lvm.c +++ b/tools/lvm.c @@ -236,7 +236,7 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) log_error("No such command '%s'. Try 'help'.", argv[0]); - if (ret && !error_message_produced()) { + if ((ret != ECMD_PROCESSED) && !error_message_produced()) { log_debug("Internal error: Failed command did not use log_error"); log_error("Command failed with status code %d.", ret); } diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 4ce2b031..0344c735 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -1099,7 +1099,7 @@ static int _run_script(struct cmd_context *cmd, int argc, char **argv) if (!strcmp(argv[0], "quit") || !strcmp(argv[0], "exit")) break; ret = lvm_run_command(cmd, argc, argv); - if (ret) { + if (ret != ECMD_PROCESSED) { if (!error_message_produced()) { log_debug("Internal error: Failed command did not use log_error"); log_error("Command failed with status code %d.", ret); @@ -1227,7 +1227,7 @@ int lvm2_main(int argc, char **argv, unsigned is_static) if (ret == ENO_SUCH_CMD) log_error("No such command. Try 'help'."); - if (ret && !error_message_produced()) { + if ((ret != ECMD_PROCESSED) && !error_message_produced()) { log_debug("Internal error: Failed command did not use log_error"); log_error("Command failed with status code %d.", ret); } |