X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.c;h=dcbffeb74c438e5b8a725a798c3e972506e4b856;hb=8ff7624a471a53c1461e6c327ab62ef703feb174;hp=8cf45410ed28957b0752d8ca05dfde78991114f0;hpb=ad80db44abea022615ab01f500d1861919981782;p=lttng-tools.git

diff --git a/src/bin/lttng/lttng.c b/src/bin/lttng/lttng.c
index 8cf45410e..dcbffeb74 100644
--- 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)
 {
-	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s\n",
+	fprintf(ofp, "%s (LTTng Trace Control) " VERSION" - " VERSION_NAME "%s%s\n",
 			progname,
-			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION);
+			GIT_VERSION[0] == '\0' ? "" : " - " GIT_VERSION,
+			EXTRA_VERSION_NAME[0] == '\0' ? "" : " - " EXTRA_VERSION_NAME);
 }
 
 /*
@@ -253,7 +254,6 @@ 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("  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);