From d82222cd136c75c368d17f8908547f5da43bb08e Mon Sep 17 00:00:00 2001 From: dpgilbert <dpgilbert@4ea69e1a-61f1-4043-bf83-b5c94c648137> Date: Tue, 1 Mar 2022 02:18:16 +0000 Subject: [PATCH] Add 'pre-release' to smartctl and smartd version information git-svn-id: https://svn.code.sf.net/p/smartmontools/code/trunk@5340 4ea69e1a-61f1-4043-bf83-b5c94c648137 --- smartmontools/ChangeLog | 12 ++++++++++++ smartmontools/utility.cpp | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/smartmontools/ChangeLog b/smartmontools/ChangeLog index dc134bc61..7f6ea2fcb 100644 --- a/smartmontools/ChangeLog +++ b/smartmontools/ChangeLog @@ -1,5 +1,17 @@ $Id$ +2022-02-28 Douglas Gilbert <dgilbert@interlog.com> + + utility.cpp: the previous patch bumped the version number + to 7.4 which probably won't be released for another + 10 to 12 months. Alter the product strings to add either + "pre-release" or just "pre-" in front of release to help + stop users thinking they are using (released) version 7.4 + until it actually is released. + N.B. When the release actually is performed, this patch + should be reversed (and then put back in after the release, + for the next cycle). + 2022-02-28 Christian Franke <franke@computer.org> smartmontools 7.3 diff --git a/smartmontools/utility.cpp b/smartmontools/utility.cpp index 64fd8012c..791d8287f 100644 --- a/smartmontools/utility.cpp +++ b/smartmontools/utility.cpp @@ -86,7 +86,7 @@ const char * packet_types[] = { std::string format_version_info(const char * prog_name, bool full /*= false*/) { std::string info = strprintf( - "%s " PACKAGE_VERSION " " + "%s pre-release " PACKAGE_VERSION " " #ifdef SMARTMONTOOLS_SVN_REV SMARTMONTOOLS_SVN_DATE " r" SMARTMONTOOLS_SVN_REV #else @@ -107,7 +107,7 @@ std::string format_version_info(const char * prog_name, bool full /*= false*/) "version 2, or (at your option) any later version.\n" "See https://www.gnu.org for further details.\n" "\n" - "smartmontools release " PACKAGE_VERSION + "smartmontools pre-release " PACKAGE_VERSION " dated " SMARTMONTOOLS_RELEASE_DATE " at " SMARTMONTOOLS_RELEASE_TIME "\n" #ifdef SMARTMONTOOLS_SVN_REV "smartmontools SVN rev " SMARTMONTOOLS_SVN_REV -- GitLab