[ARVADOS-DEV] updated: 61974cf1393c51568293d19685ea3a4aafc4a770

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-build-packages.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

       via  61974cf1393c51568293d19685ea3a4aafc4a770 (commit)
      from  b8048416d62f1c380f425d0d2dc7ed0fbbd6fe5c (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 61974cf1393c51568293d19685ea3a4aafc4a770
Author: Ward Vandewege <ward at curoverse.com>
Date:   Fri Aug 7 10:56:45 2015 -0400

    Make sure that we build arvados-src package with the correct version of
    the git tree, not latest.
    
    No issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 1ceecee..7178c59 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -447,19 +447,22 @@ if [[ ! -d "$WORKSPACE/src-build-dir" ]]; then
   fi
 fi
 
+# Get the commit hash we're building against, from the working directory
+cd "$WORKSPACE"
+MASTER_COMMIT_HASH=$(format_last_commit_here "%H")
+
+# Make sure we check out that commit in the clean $WORKSPACE/src-build-dir directory
 cd "$WORKSPACE/src-build-dir"
 # just in case, check out master
 if [[ "$DEBUG" != 0 ]]; then
   git checkout master
   git pull
   # go into detached-head state
-  MASTER_COMMIT_HASH=$(format_last_commit_here "%H")
   git checkout "$MASTER_COMMIT_HASH"
 else
   git checkout -q master
   git pull -q
   # go into detached-head state
-  MASTER_COMMIT_HASH=$(format_last_commit_here "%H")
   git checkout -q "$MASTER_COMMIT_HASH"
 fi
 echo "$MASTER_COMMIT_HASH" >git-commit.version

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


hooks/post-receive
--