X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcli%2Fbabeltrace2-cfg-cli-args-default.c;h=b73457a2a869222b06fb1cbcc755680145bf6541;hb=58bb04cbaab6d70deba08c4630c957485807a4e6;hp=aef23a53f607e16c4ff29fd02e0a695cae598b40;hpb=7b783015be97fd9ccb0368380b53929e0cbb76af;p=babeltrace.git diff --git a/src/cli/babeltrace2-cfg-cli-args-default.c b/src/cli/babeltrace2-cfg-cli-args-default.c index aef23a53..b73457a2 100644 --- a/src/cli/babeltrace2-cfg-cli-args-default.c +++ b/src/cli/babeltrace2-cfg-cli-args-default.c @@ -52,6 +52,22 @@ struct bt_config *bt_config_cli_args_create_with_default(int argc, goto error; } +#ifdef CONFIG_IN_TREE_PROVIDER_DIR + /* + * Set LIBBABELTRACE2_PLUGIN_PROVIDER_DIR to load the in-tree Python + * plugin provider, if the env variable is already set, do not overwrite + * it. + */ + setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", CONFIG_IN_TREE_PROVIDER_DIR, 0); +#else + /* + * If the Pyhton plugin provider is disabled, use a non-exitent path to avoid + * loading the system installed provider if it exit, if the env variable is + * already set, do not overwrite it. + */ + setenv("LIBBABELTRACE2_PLUGIN_PROVIDER_DIR", "/nonexistent", 0); +#endif + cfg = bt_config_cli_args_create(argc, argv, retcode, true, true, initial_plugin_paths); goto end;