From 7083b2658975b0133c33ac895e21fdb40f15b279 Mon Sep 17 00:00:00 2001
From: "Mark A. Grondona" <mgrondona@llnl.gov>
Date: Wed, 12 Oct 2011 09:26:06 -0700
Subject: [PATCH] Allow appending version information to SLURM_RELEASE
For a long time configure has modified the SLURM Release number
as set in META by stripping off everything before the last '.'
when building the SLURM_VERSION_STRING. This was done so that a
release number of 0.pre1 would become just 'pre1' in the version
string printed by SLURM commands. (e.g. slurm-2.3.0-0.pre1 becomes
slurm-2.3.0-pre1 in sinfo --version).
In attempting to create a new version 2.3.0-2.x of SLURM (branched
from 2.3.0-2), it was found that this method is overzealous, and
results in a version string of just "2.3.0-1" instead of the expected
"2.3.0-2.1". Since the intent of the sed command is only to remove
'0.' from prereleases, this patch makes that explicit, so that
non-prerelease versions branched of tagged SLURM releases keep the
original Release number in the version string.
---
auxdir/slurm.m4 | 2 +-
configure | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/auxdir/slurm.m4 b/auxdir/slurm.m4
index c730cdee155..512a002c980 100644
--- a/auxdir/slurm.m4
+++ b/auxdir/slurm.m4
@@ -204,7 +204,7 @@ if echo "$RELEASE" | grep -e "UNSTABLE"; then
SLURM_RELEASE="unstable svn build $DATE"
SLURM_VERSION_STRING="$SLURM_MAJOR.$SLURM_MINOR ($SLURM_RELEASE)"
else
- SLURM_RELEASE="`echo $RELEASE | sed 's/^.*\.//'`"
+ SLURM_RELEASE="`echo $RELEASE | sed 's/^0\.//'`"
SLURM_VERSION_STRING="$SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO"
test $RELEASE = "1" || SLURM_VERSION_STRING="$SLURM_VERSION_STRING-$SLURM_RELEASE"
fi
diff --git a/configure b/configure
index 9ae9d31f662..0187e74b5bb 100755
--- a/configure
+++ b/configure
@@ -2974,7 +2974,7 @@ if echo "$RELEASE" | grep -e "UNSTABLE"; then
SLURM_RELEASE="unstable svn build $DATE"
SLURM_VERSION_STRING="$SLURM_MAJOR.$SLURM_MINOR ($SLURM_RELEASE)"
else
- SLURM_RELEASE="`echo $RELEASE | sed 's/^.*\.//'`"
+ SLURM_RELEASE="`echo $RELEASE | sed 's/^0\.//'`"
SLURM_VERSION_STRING="$SLURM_MAJOR.$SLURM_MINOR.$SLURM_MICRO"
test $RELEASE = "1" || SLURM_VERSION_STRING="$SLURM_VERSION_STRING-$SLURM_RELEASE"
fi
--
GitLab