From: Peter Amstutz <peter.amstutz@curii.com>
Date: Thu, 16 Jan 2020 15:40:08 +0000 (-0500)
Subject: version-at-commit.sh uses '.dev' instead of '.pre'
X-Git-Tag: 2.0.0~51
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ecf1cbf6b843ec566890b4bf944fb893ca9481de

version-at-commit.sh uses '.dev' instead of '.pre'

Makes Python happy -- setuptools allows '.dev' in the version, but
normalizes '.pre' into '.rc' which actually changes the package
filename.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>
---

diff --git a/build/version-at-commit.sh b/build/version-at-commit.sh
index 3a52c4b204..6ed34244a1 100755
--- a/build/version-at-commit.sh
+++ b/build/version-at-commit.sh
@@ -3,6 +3,7 @@
 set -e -o pipefail
 commit="$1"
 versionglob="[0-9].[0-9]*.[0-9]*"
+devsuffix=".dev"
 
 if ! git describe --exact-match --match "$versionglob" "$commit" 2>/dev/null; then
     if git merge-base --is-ancestor "$commit" origin/master; then
@@ -14,5 +15,5 @@ if ! git describe --exact-match --match "$versionglob" "$commit" 2>/dev/null; th
     fi
     isodate=$(TZ=UTC git log -n1 --format=%cd --date=iso "$commit")
     ts=$(TZ=UTC date --date="$isodate" "+%Y%m%d%H%M%S")
-    echo "$v.pre$ts"
+    echo "${v}${devsuffix}${ts}"
 fi