From 697e3bb2df5925a6fe632dad919060dc418a2a0e Mon Sep 17 00:00:00 2001 From: Alasdair Kergon Date: Fri, 6 Jun 2008 17:36:19 +0000 Subject: back out unnecessary changes for this release --- tools/commands.h | 9 +++------ tools/lvm.c | 4 ---- tools/lvmcmdline.c | 16 +--------------- 3 files changed, 4 insertions(+), 25 deletions(-) (limited to 'tools') diff --git a/tools/commands.h b/tools/commands.h index efac7594..7c0921c1 100644 --- a/tools/commands.h +++ b/tools/commands.h @@ -368,7 +368,6 @@ xx(lvs, "\t[-o|--options [+]Field[,Field]]\n" "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n" "\t[-P|--partial] " "\n" - "\t[--prefixes]\n" "\t[--segments]\n" "\t[--separator Separator]\n" "\t[--trustcache]\n" @@ -379,7 +378,7 @@ xx(lvs, "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n", aligned_ARG, all_ARG, ignorelockingfailure_ARG, noheadings_ARG, - nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, prefixes_ARG, + nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, units_ARG) @@ -577,7 +576,6 @@ xx(pvs, "\t[-o|--options [+]Field[,Field]]\n" "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n" "\t[-P|--partial] " "\n" - "\t[--prefixes]\n" "\t[--segments]\n" "\t[--separator Separator]\n" "\t[--trustcache]\n" @@ -588,7 +586,7 @@ xx(pvs, "\t[PhysicalVolume [PhysicalVolume...]]\n", aligned_ARG, all_ARG, ignorelockingfailure_ARG, noheadings_ARG, - nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, prefixes_ARG, + nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, segments_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, units_ARG) @@ -894,7 +892,6 @@ xx(vgs, "\t[-o|--options [+]Field[,Field]]\n" "\t[-O|--sort [+|-]key1[,[+|-]key2[,...]]]\n" "\t[-P|--partial] " "\n" - "\t[--prefixes]\n" "\t[--separator Separator]\n" "\t[--trustcache]\n" "\t[--unbuffered]\n" @@ -904,7 +901,7 @@ xx(vgs, "\t[VolumeGroupName [VolumeGroupName...]]\n", aligned_ARG, all_ARG, ignorelockingfailure_ARG, noheadings_ARG, - nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, prefixes_ARG, + nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, units_ARG) xx(vgscan, diff --git a/tools/lvm.c b/tools/lvm.c index 3576515d..7d58ae82 100644 --- a/tools/lvm.c +++ b/tools/lvm.c @@ -236,10 +236,6 @@ int lvm_shell(struct cmd_context *cmd, struct cmdline_context *cmdline) log_error("No such command '%s'. Try 'help'.", argv[0]); - 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); - } _write_history(); } diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 0344c735..bb3fdaec 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -875,8 +875,6 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) int ret = 0; int locking_type; - init_error_message_produced(0); - /* each command should start out with sigint flag cleared */ sigint_clear(); @@ -1098,14 +1096,7 @@ static int _run_script(struct cmd_context *cmd, int argc, char **argv) continue; if (!strcmp(argv[0], "quit") || !strcmp(argv[0], "exit")) break; - ret = lvm_run_command(cmd, argc, argv); - 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); - } - break; - } + lvm_run_command(cmd, argc, argv); } if (fclose(script)) @@ -1227,11 +1218,6 @@ int lvm2_main(int argc, char **argv, unsigned is_static) if (ret == ENO_SUCH_CMD) log_error("No such command. Try 'help'."); - 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); - } - out: lvm_fin(cmd); if (ret == ECMD_PROCESSED) -- cgit