back out unnecessary changes for this release

diff --git a/VERSION b/VERSION
index 69bf08b5a2f71c254325ae0f3e135e9bf3679966..2d46bc7cfea641cc30343e02fcedf07a22b35064 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.37-cvs (2008-04-29)
+2.02.37-cvs (2008-06-06)

diff --git a/WHATS_NEW b/WHATS_NEW
index 8b70fab621f5cdb2309f5be8215f30db6657d0ee..dd053c8bbbdaf8aff22988670f6d2ce12be91f87 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,10 +1,3 @@
-Version 2.02.38 - 
-=================================
-  In script-processing mode, stop if any command fails.
-  Warn if command exits with non-zero status code without a prior log_error.
-  Check lv_count in vg_validate.
-  Add --prefixes to reporting tools for field name prefix output format.
-
 Version 2.02.37 - 6th June 2008
 ===============================
   Make clvmd-cman use a hash rather than an array for node updown info.

diff --git a/lib/log/log.c b/lib/log/log.c
index e8806619e967b791880245149642b3f233b8779e..f32e56ea3e0b4c365a1043ab695197d00e06c8fe 100644 (file)
--- a/lib/log/log.c
+++ b/lib/log/log.c
@@ -51,7 +51,6 @@ static int _already_logging = 0;
 static int _mirror_in_sync = 0;
 static int _dmeventd_monitor = DEFAULT_DMEVENTD_MONITOR;
 static int _ignore_suspended_devices = 0;
-static int _error_message_produced = 0;
 
 static lvm2_log_fn_t _lvm2_log_fn = NULL;
 
@@ -239,16 +238,6 @@ void init_indent(int indent)
        _indent = indent;
 }
 
-void init_error_message_produced(int error_message_produced)
-{
-       _error_message_produced = error_message_produced;
-}
-
-int error_message_produced(void)
-{
-       return _error_message_produced;
-}
-
 int test_mode()
 {
        return _test;
@@ -333,9 +322,6 @@ void print_log(int level, const char *file, int line, const char *format, ...)
        if (_log_suppress == 2)
                return;
 
-       if (level <= _LOG_ERR)
-               _error_message_produced = 1;
-
        trformat = _(format);
 
        if (_lvm2_log_fn) {

diff --git a/lib/log/log.h b/lib/log/log.h
index 8b85758bf2842f7e3b936ccfe089af2f283faa8f..d5e0664e75ab4d49c5b6ffd03b25af3924ab57e3 100644 (file)
--- a/lib/log/log.h
+++ b/lib/log/log.h
@@ -79,7 +79,6 @@ void init_security_level(int level);
 void init_mirror_in_sync(int in_sync);
 void init_dmeventd_monitor(int reg);
 void init_ignore_suspended_devices(int ignore);
-void init_error_message_produced(int error_message_produced);
 
 void set_cmd_name(const char *cmd_name);
 
@@ -95,7 +94,6 @@ int lockingfailed(void);
 int security_level(void);
 int mirror_in_sync(void);
 int ignore_suspended_devices(void);
-int error_message_produced(void);
 
 #define DMEVENTD_MONITOR_IGNORE -1
 int dmeventd_monitor_mode(void);

diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index d385814a8eef010ad61ee7bcbf32d243d6bfb2aa..8fc39515e167ae931b8007096ef54e2c1eeecef7 100644 (file)
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1213,11 +1213,10 @@ int vg_validate(struct volume_group *vg)
 
        if ((lv_count = (uint32_t) list_size(&vg->lvs)) !=
            vg->lv_count + 2 * vg->snapshot_count) {
-               log_error("Internal error: #internal LVs (%u) != #LVs (%"
+               log_debug("Internal error: #internal LVs (%u) != #LVs (%"
                          PRIu32 ") + 2 * #snapshots (%" PRIu32 ") in VG %s",
                          list_size(&vg->lvs), vg->lv_count,
                          vg->snapshot_count, vg->name);
-               r = 0;
        }
 
        list_iterate_items(lvl, &vg->lvs) {

diff --git a/lib/report/report.c b/lib/report/report.c
index f2ffd98271aae7b8f78e1d1e965160f69e01a178..d067bd305890971970b753bf7af77187ace62d89 100644 (file)
--- a/lib/report/report.c
+++ b/lib/report/report.c
@@ -1091,15 +1091,9 @@ void *report_init(struct cmd_context *cmd, const char *format, const char *keys,
        if (headings)
                report_flags |= DM_REPORT_OUTPUT_HEADINGS;
 
-       if (field_prefixes)
-               report_flags |= DM_REPORT_OUTPUT_FIELD_NAME_PREFIX;
-
        rh = dm_report_init(report_type, _report_types, _fields, format,
                            separator, report_flags, keys, cmd);
 
-       if (field_prefixes)
-               dm_report_set_output_field_name_prefix(rh, "lvm2_");
-
        return rh;
 }
 

diff --git a/tools/commands.h b/tools/commands.h
index efac7594c12f24d6cc7620bdfb4b0cff703665eb..7c0921c1c46b12a88a582177d0ebeb1382b6f075 100644 (file)
--- 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 3576515df97f55ffa1b57d7f23dcce9191bfdda8..7d58ae829f086775fdbd70ae3bc85d070191be1b 100644 (file)
--- 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 0344c735ef4f76fa1828f86c17f359b626d9deb8..bb3fdaecc0e5d6f5d2310665ec973907c1b5f625 100644 (file)
--- 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)