[ARVADOS] updated: 1.1.1-114-g5f0d04c

Git user git at public.curoverse.com
Mon Dec 4 13:00:26 EST 2017


Summary of changes:
 build/run-build-test-packages-one-target.sh | 2 +-
 build/run-library.sh                        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

       via  5f0d04c50f9a58dafe6e9adc5f769e95b9a8d5f7 (commit)
      from  a93098fbd4ccb72577be9594a7af8fba578bdcb5 (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 5f0d04c50f9a58dafe6e9adc5f769e95b9a8d5f7
Author: Fernando Monserrat <fernando.monserrat at gmail.com>
Date:   Mon Dec 4 15:00:15 2017 -0300

    12771: pass newversion for packages or take the usual hash
    Arvados-DCO-1.1-Signed-off-by: Fernando Monserrat <fmonserrat at veritasgenetics.com>

diff --git a/build/run-build-test-packages-one-target.sh b/build/run-build-test-packages-one-target.sh
index f90cae4..335b06a 100755
--- a/build/run-build-test-packages-one-target.sh
+++ b/build/run-build-test-packages-one-target.sh
@@ -59,7 +59,7 @@ while [ $# -gt 0 ]; do
             ;;
         --verno)
             VERNO="$2"; shift
-            $VERNO >>$WORKSPACE/version
+            $VERNO > $WORKSPACE/version
             ;;              
         --upload)
             UPLOAD=1
diff --git a/build/run-library.sh b/build/run-library.sh
index fe9945a..5a729f2 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -40,8 +40,8 @@ format_last_commit_here() {
 version_from_git() {
   # Generates a version number from the git log for the current working
   # directory, and writes it to stdout.
-  cat $WORKSPACE/version >> $VERNO
-  if [ -n "${VERNO}" ]; then
+  VERNO=$(<version)
+  if [ -n $VERNO ]; then
       new_version="${VERNO}"
       echo "${new_version}"
   else    

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list