projects
/
deliverable
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Backport: Use EXTRA_VERSION_NAME and EXTRA_VERSION_DESCRIPTION
[deliverable/lttng-tools.git]
/
src
/
bin
/
lttng
/
lttng.c
diff --git
a/src/bin/lttng/lttng.c
b/src/bin/lttng/lttng.c
index 1aa15300132592e97756a091ca410a3d49a556e5..dcbffeb74c438e5b8a725a798c3e972506e4b856 100644
(file)
--- a/
src/bin/lttng/lttng.c
+++ b/
src/bin/lttng/lttng.c
@@
-93,9
+93,10
@@
static struct cmd_struct commands[] = {
static void version(FILE *ofp)
{
static void version(FILE *ofp)
{
- fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s\n",
+ fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s
%s
\n",
progname,
progname,
- GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+ GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+ EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
}
/*
}
/*
@@
-253,7
+254,7
@@
static void show_basic_help(void)
puts(" create " CONFIG_CMD_DESCR_CREATE);
puts(" destroy " CONFIG_CMD_DESCR_DESTROY);
puts(" load " CONFIG_CMD_DESCR_LOAD);
puts(" create " CONFIG_CMD_DESCR_CREATE);
puts(" destroy " CONFIG_CMD_DESCR_DESTROY);
puts(" load " CONFIG_CMD_DESCR_LOAD);
- puts("
metadata " CONFIG_CMD_DESCR_METADATA
);
+ puts("
regenerate " CONFIG_CMD_DESCR_REGENERATE
);
puts(" save " CONFIG_CMD_DESCR_SAVE);
puts(" set-session " CONFIG_CMD_DESCR_SET_SESSION);
puts("");
puts(" save " CONFIG_CMD_DESCR_SAVE);
puts(" set-session " CONFIG_CMD_DESCR_SET_SESSION);
puts("");
This page took
0.024935 seconds
and
5
git commands to generate.