You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

50 lines
1.7 KiB

WHATS_NEW | 4 ++++
tools/lvmcmdline.c | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/WHATS_NEW b/WHATS_NEW
index e74fd55..5de648c 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,3 +1,7 @@
+Version 2.02.131 -
+=====================================
+ Ignore persistent cache if configuration changed. (2.02.127)
+
Version 2.02.130 - 5th September 2015
=====================================
Fix use of uninitialized device status if reading outdated .cache record.
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index b7809c7..d3bace7 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1478,6 +1478,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
char *arg_new, *arg;
int i;
int skip_hyphens;
+ int refresh_done = 0;
init_error_message_produced(0);
@@ -1554,6 +1555,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
log_error("Updated config file invalid. Aborting.");
return ECMD_FAILED;
}
+ refresh_done = 1;
}
if (!_prepare_profiles(cmd))
@@ -1562,7 +1564,11 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
if (!cmd->initialized.connections && !_cmd_no_meta_proc(cmd) && !init_connections(cmd))
return_ECMD_FAILED;
- if (!cmd->initialized.filters && !_cmd_no_meta_proc(cmd) && !init_filters(cmd, 1))
+ /* Note: Load persistent cache only if we haven't refreshed toolcontext!
+ * If toolcontext has been refreshed, it means config has changed
+ * and we can't rely on persistent cache anymore.
+ */
+ if (!cmd->initialized.filters && !_cmd_no_meta_proc(cmd) && !init_filters(cmd, !refresh_done))
return_ECMD_FAILED;
if (arg_count(cmd, readonly_ARG))