From 198a3409881f5b9f1fe77ae551efde1968bfb639 Mon Sep 17 00:00:00 2001
From: Fernando Monserrat <fernando.monserrat@gmail.com>
Date: Wed, 14 Mar 2018 16:24:15 -0300
Subject: [PATCH] 13200:fix python gittagers version with latest git tag and
 timestamp Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat
 <fmonserrat@veritasgenetics.com>

---
 build/run-library.sh            | 3 ++-
 sdk/cwl/setup.py                | 2 +-
 sdk/python/setup.py             | 2 +-
 services/dockercleaner/setup.py | 2 +-
 services/nodemanager/setup.py   | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build/run-library.sh b/build/run-library.sh
index 9f77cb8dc5..83d069c260 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -52,6 +52,7 @@ version_from_git() {
 
     ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
     local git_ts 
+
     declare $(format_last_commit_here "git_ts=%ct")
     ARVADOS_BUILDING_VERSION="$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S)"
     echo "$ARVADOS_BUILDING_VERSION"
@@ -71,7 +72,7 @@ timestamp_from_git() {
 
 handle_python_package () {
   # This function assumes the current working directory is the python package directory
-  if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.tar.gz" -print -quit)" ]; then
+  if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
     # This package doesn't need rebuilding.
     return
   fi
diff --git a/sdk/cwl/setup.py b/sdk/cwl/setup.py
index 0e9ee945fb..d9dd970c82 100644
--- a/sdk/cwl/setup.py
+++ b/sdk/cwl/setup.py
@@ -16,7 +16,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "1.0"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit
diff --git a/sdk/python/setup.py b/sdk/python/setup.py
index 88bf51e8a8..5804517a6c 100644
--- a/sdk/python/setup.py
+++ b/sdk/python/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit
diff --git a/services/dockercleaner/setup.py b/services/dockercleaner/setup.py
index 6a6a96a045..1506c20820 100644
--- a/services/dockercleaner/setup.py
+++ b/services/dockercleaner/setup.py
@@ -12,7 +12,7 @@ from setuptools import setup, find_packages
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit
diff --git a/services/nodemanager/setup.py b/services/nodemanager/setup.py
index 454c24edbf..437e95e272 100644
--- a/services/nodemanager/setup.py
+++ b/services/nodemanager/setup.py
@@ -15,7 +15,7 @@ README = os.path.join(SETUP_DIR, 'README.rst')
 tagger = egg_info_cmd.egg_info
 version = os.environ.get("ARVADOS_BUILDING_VERSION")
 if not version:
-    version = "0.1"
+    version = ""
     try:
         import gittaggers
         tagger = gittaggers.EggInfoFromGit
-- 
2.30.2