[ARVADOS] updated: 1.1.3-158-g2d10f50

[Git user]

Summary of changes:
 build/run-library.sh  | 8 +-------
 sdk/cwl/gittaggers.py | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

       via  2d10f50f273a34077a989bbee6681724528e04c6 (commit)
      from  65c557035c0b36f0b2f0d4a602ca396e566eb158 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 2d10f50f273a34077a989bbee6681724528e04c6
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Wed Mar 14 15:48:26 2018 -0300

    13200:fix python gittagers version with latest git tag and timestamp
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-library.sh b/build/run-library.sh
index 5db8fd2..9f77cb8 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -52,12 +52,6 @@ version_from_git() {
 
     ARVADOS_BUILDING_VERSION=`git describe --abbrev=0`
     local git_ts 
-    if [[ -n "$1" ]] ; then
-        prefix="$1"
-    else
-        prefix="0.1"
-    fi
-
     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"
@@ -77,7 +71,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.$(date -ud "@$git_ts" +%Y%m%d%H%M%S).tar.gz" -print -quit)" ]; then
+  if [ -n "$(find dist -name "*-$ARVADOS_BUILDING_VERSION.tar.gz" -print -quit)" ]; then
     # This package doesn't need rebuilding.
     return
   fi
diff --git a/sdk/cwl/gittaggers.py b/sdk/cwl/gittaggers.py
index da5ae3b..40f6e6c 100644
--- a/sdk/cwl/gittaggers.py
+++ b/sdk/cwl/gittaggers.py
@@ -41,5 +41,5 @@ class EggInfoFromGit(egg_info):
 
     def tags(self):
         if self.tag_build is None:
-            self.tag_build = self.git_timestamp_tag() + self.git_latest_tag()
+            self.tag_build = self.git_latest_tag() + self.git_timestamp_tag()
         return egg_info.tags(self)

-----------------------------------------------------------------------


hooks/post-receive
--