X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace.c;h=56e32714710c68e524e855d5dcb56349c93bda85;hb=2fad3ae7073bb826bbd7250b281821d3f87b8eb7;hp=95b89c81d85b44a02ba49c42da0521514ec72535;hpb=c7eee084ca459af66ba1f6d375fba3f89db93584;p=babeltrace.git

diff --git a/cli/babeltrace.c b/cli/babeltrace.c
index 95b89c81..56e32714 100644
--- a/cli/babeltrace.c
+++ b/cli/babeltrace.c
@@ -55,17 +55,20 @@
  */
 static const char* log_level_env_var_names[] = {
 	"BABELTRACE_COMMON_LOG_LEVEL",
+	"BABELTRACE_COMPAT_LOG_LEVEL",
 	"BABELTRACE_PLUGIN_CTF_BTR_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_CTF_FS_SRC_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_CTF_LTTNG_LIVE_SRC_LOG_LEVEL",
+	"BABELTRACE_SINK_CTF_FS_LOG_LEVEL",
+	"BABELTRACE_SRC_CTF_FS_LOG_LEVEL",
+	"BABELTRACE_SRC_CTF_LTTNG_LIVE_LOG_LEVEL",
 	"BABELTRACE_PLUGIN_CTF_METADATA_LOG_LEVEL",
 	"BABELTRACE_PLUGIN_CTF_NOTIF_ITER_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_LTTNG_UTILS_DEBUG_INFO_FLT_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_TEXT_DMESG_SRC_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_UTILS_MUXER_FLT_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_UTILS_TRIMMER_FLT_LOG_LEVEL",
 	"BABELTRACE_PLUGIN_CTFCOPYTRACE_LIB_LOG_LEVEL",
-	"BABELTRACE_PLUGIN_CTF_FS_SINK_LOG_LEVEL",
+	"BABELTRACE_FLT_LTTNG_UTILS_DEBUG_INFO_LOG_LEVEL",
+	"BABELTRACE_SRC_TEXT_DMESG_LOG_LEVEL",
+	"BABELTRACE_SINK_TEXT_PRETTY_LOG_LEVEL",
+	"BABELTRACE_FLT_UTILS_MUXER_LOG_LEVEL",
+	"BABELTRACE_FLT_UTILS_TRIMMER_LOG_LEVEL",
+	"BABELTRACE_PYTHON_BT2_LOG_LEVEL",
 	"BABELTRACE_PYTHON_PLUGIN_PROVIDER_LOG_LEVEL",
 	NULL,
 };
@@ -1032,9 +1035,8 @@ int cmd_help(struct bt_config *cfg)
 		if (cfg->cmd_data.help.cfg_component->type !=
 				BT_COMPONENT_CLASS_TYPE_UNKNOWN) {
 			if (strcmp(cfg->cmd_data.help.cfg_component->comp_cls_name->str,
-					comp_class_name) != 0 &&
-					type ==
-					cfg->cmd_data.help.cfg_component->type) {
+					comp_class_name) != 0 ||
+					type != cfg->cmd_data.help.cfg_component->type) {
 				bt_put(comp_cls);
 				continue;
 			}