From a1e34893cd2b06dc11f45bf01aeb589d74db4a26 Mon Sep 17 00:00:00 2001 From: Philippe Proulx Date: Wed, 22 Feb 2017 10:26:00 -0500 Subject: [PATCH] babeltrace-cfg.c: do not infer text.text sink with -v MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Having the -v option passed to the `convert` command is not a sufficient criterion to infer a text.text sink component, because -v is also a general option which applies to the whole command. Without this patch, you can't run this: babeltrace -v /path/to/trace -o my.sink because the configurator sees both an implicit text.text sink (caused by -v) and an explicit my.sink sink. Signed-off-by: Philippe Proulx Signed-off-by: Jérémie Galarneau --- converter/babeltrace-cfg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/converter/babeltrace-cfg.c b/converter/babeltrace-cfg.c index f281ee50..706fbfd8 100644 --- a/converter/babeltrace-cfg.c +++ b/converter/babeltrace-cfg.c @@ -187,7 +187,7 @@ bool text_legacy_opts_is_any_set(struct text_legacy_opts *opts) bt_value_array_size(opts->names) > 0 || bt_value_array_size(opts->fields) > 0 || opts->no_delta || opts->clock_cycles || opts->clock_seconds || - opts->clock_date || opts->clock_gmt || opts->verbose || + opts->clock_date || opts->clock_gmt || opts->dbg_info_full_path; } -- 2.34.1