[lvm-devel] master - logging: Write Completed message before resetting.

[Alasdair Kergon]

Gitweb:        http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=96880102a3b792cadbfc97e44c09c5714a96ca9e
Commit:        96880102a3b792cadbfc97e44c09c5714a96ca9e
Parent:        5face2010dfb4e9fef43b867b4736a90abe51c00
Author:        Alasdair G Kergon <agk at redhat.com>
AuthorDate:    Fri Sep 6 01:47:41 2013 +0100
Committer:     Alasdair G Kergon <agk at redhat.com>
CommitterDate: Fri Sep 6 01:47:41 2013 +0100

logging: Write Completed message before resetting.

---
 WHATS_NEW          |    1 +
 tools/lvmcmdline.c |    7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WHATS_NEW b/WHATS_NEW
index abfe0e1..212f4bb 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.101 - 
 ===================================
+  Write Completed debug message before reinstating log defaults after command.
   Skip pvmove of RAID, thin, snapshot, origin, or mirror LVs in a cluster.
   Refresh existing VG before autoactivation (event retrigger/device reappeared).
   Use pvscan -b in udev rules to avoid a deadlock on udev process count limit.
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index c7917ea..116e963 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1190,15 +1190,14 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
 			stack;
 	}
 
-	/* FIXME Move this? */
-	cmd->current_settings = cmd->default_settings;
-	_apply_settings(cmd);
-
 	if (ret == EINVALID_CMD_LINE && !_cmdline.interactive)
 		_short_usage(cmd->command->name);
 
 	log_debug("Completed: %s", cmd->cmd_line);
 
+	cmd->current_settings = cmd->default_settings;
+	_apply_settings(cmd);
+
 	/*
 	 * free off any memory the command used.
 	 */