[ARVADOS] updated: 1.1.2-52-gf44a15a

[Git user]

Summary of changes:
 build/build-dev-docker-jobs-image.sh | 13 +++++++------
 services/crunch-run/crunchrun.go     |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

       via  f44a15adce692614ecb816dbe2d0205704d9a4ab (commit)
      from  75cb3149396f6385d6af30deaed74ee87ace696d (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 f44a15adce692614ecb816dbe2d0205704d9a4ab
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Mon Jan 15 16:34:19 2018 -0500

    12934: Fix gofmt
    
    Also fix build-dev-docker-jobs-image.sh to use correct tag.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/build/build-dev-docker-jobs-image.sh b/build/build-dev-docker-jobs-image.sh
index 639096c..e1e5063 100755
--- a/build/build-dev-docker-jobs-image.sh
+++ b/build/build-dev-docker-jobs-image.sh
@@ -64,12 +64,13 @@ fi
 python_sdk_ts=$(cd sdk/python && timestamp_from_git)
 cwl_runner_ts=$(cd sdk/cwl && timestamp_from_git)
 
+python_sdk_version=$(cd sdk/python && nohash_version_from_git 0.1)
+cwl_runner_version=$(cd sdk/cwl && nohash_version_from_git 1.0)
+
 if [[ $python_sdk_ts -gt $cwl_runner_ts ]]; then
-    gittag=$(git log --first-parent --max-count=1 --format=format:%H sdk/python)
-else
-    gittag=$(git log --first-parent --max-count=1 --format=format:%H sdk/cwl)
+    cwl_runner_version=$(cd sdk/python && nohash_version_from_git 1.0)
 fi
 
-docker build --build-arg sdk=$sdk --build-arg runner=$runner --build-arg salad=$salad --build-arg cwltool=$cwltool -f "$WORKSPACE/sdk/dev-jobs.dockerfile" -t arvados/jobs:$gittag "$WORKSPACE/sdk"
-echo arv-keepdocker arvados/jobs $gittag
-arv-keepdocker arvados/jobs $gittag
+docker build --build-arg sdk=$sdk --build-arg runner=$runner --build-arg salad=$salad --build-arg cwltool=$cwltool -f "$WORKSPACE/sdk/dev-jobs.dockerfile" -t arvados/jobs:$cwl_runner_version "$WORKSPACE/sdk"
+echo arv-keepdocker arvados/jobs $cwl_runner_version
+arv-keepdocker arvados/jobs $cwl_runner_version
diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index bf5a164..bb5973d 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -1057,7 +1057,7 @@ func (runner *ContainerRunner) UploadOutputFile(
 	if info.Mode().IsDir() {
 		// if empty, need to create a .keep file
 		dir, direrr := os.Open(path)
-		if (direrr != nil) {
+		if direrr != nil {
 			return "", direrr
 		}
 		defer dir.Close()

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


hooks/post-receive
--