From 2e650c1f5f2f79e7db10dec5dcdd1cffcaf47891 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 26 Jul 2022 07:11:40 +0200 Subject: Merging upstream version 2.1~rc0 (Closes: #1015722). Signed-off-by: Daniel Baumann --- plugin.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'plugin.c') diff --git a/plugin.c b/plugin.c index fd8f67d..c05bb72 100644 --- a/plugin.c +++ b/plugin.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later #include #include #include @@ -6,14 +7,22 @@ #include "plugin.h" #include "util/argconfig.h" +#include + static int version(struct plugin *plugin) { struct program *prog = plugin->parent; - if (plugin->name) - printf("%s %s version %s\n", prog->name, plugin->name, plugin->version); - else - printf("%s version %s\n", prog->name, prog->version); + if (plugin->name) { + printf("%s %s version %s (git %s)\n", + prog->name, plugin->name, plugin->version, GIT_VERSION); + } else { + printf("%s version %s (git %s)\n", + prog->name, prog->version, GIT_VERSION); + } + printf("libnvme version %s (git %s)\n", + nvme_get_version(NVME_VERSION_PROJECT), + nvme_get_version(NVME_VERSION_GIT)); return 0; } -- cgit v1.2.3