projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: accept override flag even without a load path
[lttng-tools.git]
/
src
/
common
/
config
/
config.c
diff --git
a/src/common/config/config.c
b/src/common/config/config.c
index 39cd57bd26038d0dd159b187440676ce836aa50d..c9777d63f673728313c9f1d0fb0d8cc783e6af21 100644
(file)
--- a/
src/common/config/config.c
+++ b/
src/common/config/config.c
@@
-2529,7
+2529,7
@@
int config_load_session(const char *path, const char *session_name,
}
ret = load_session_from_path(path, session_name,
}
ret = load_session_from_path(path, session_name,
- &validation_ctx,
0
);
+ &validation_ctx,
override
);
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
free(path);
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
free(path);
@@
-2541,7
+2541,7
@@
int config_load_session(const char *path, const char *session_name,
/* Try system session configuration path */
ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
/* Try system session configuration path */
ret = load_session_from_path(DEFAULT_SESSION_SYSTEM_CONFIGPATH,
- session_name, &validation_ctx,
0
);
+ session_name, &validation_ctx,
override
);
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
goto end;
if (!ret || (ret && ret != -LTTNG_ERR_LOAD_SESSION_NOENT)) {
/* Session found or an error occured */
goto end;
This page took
0.024147 seconds
and
4
git commands to generate.