[ARVADOS] updated: 5caa73a3bf5a17241bf908c75aa2c3aa427289d1

[Git user]

Summary of changes:
 services/crunch-run/crunchrun.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

       via  5caa73a3bf5a17241bf908c75aa2c3aa427289d1 (commit)
      from  da42861619eb478cd1f01d58a1ebe59f1a25002e (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 5caa73a3bf5a17241bf908c75aa2c3aa427289d1
Author: radhika <radhika at curoverse.com>
Date:   Tue Jan 31 09:39:43 2017 -0500

    9397: update comments

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index bd4c5cc..2bbd3d9 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -240,8 +240,6 @@ func (runner *ContainerRunner) ArvMountCmd(arvMountCmd []string, token string) (
 	return c, nil
 }
 
-var tmpBackedOutputDir = false
-
 func (runner *ContainerRunner) SetupArvMountPoint(prefix string) (err error) {
 	if runner.ArvMountPoint == "" {
 		runner.ArvMountPoint, err = runner.MkTempDir("", prefix)
@@ -353,7 +351,6 @@ func (runner *ContainerRunner) SetupMounts() (err error) {
 			}
 			runner.CleanupTempDir = append(runner.CleanupTempDir, runner.HostOutputDir)
 			runner.Binds = append(runner.Binds, fmt.Sprintf("%s:%s", runner.HostOutputDir, bind))
-			tmpBackedOutputDir = true
 
 		case mnt.Kind == "tmp":
 			runner.Binds = append(runner.Binds, bind)
@@ -751,7 +748,7 @@ func (runner *ContainerRunner) getCollectionManifestForPath(mnt arvados.Mount, b
 
 	manifestText := ""
 	if mnt.Path == "" || mnt.Path == "/" {
-		// no path specified; return the entire manifest text
+		// no path specified; return the entire manifest text after making adjustments
 		manifestText = collection.ManifestText
 		manifestText = strings.Replace(manifestText, "./", "."+bindSuffix+"/", -1)
 		manifestText = strings.Replace(manifestText, ". ", "."+bindSuffix+" ", -1)
@@ -792,7 +789,7 @@ func (runner *ContainerRunner) getCollectionManifestForPath(mnt arvados.Mount, b
 								if strings.Index(t, ":") == -1 {
 									manifestText += (" " + t)
 								} else {
-									break // done reading all non-file tokens
+									break // done reading all non-file tokens of this stream
 								}
 							}
 							manifestText = strings.Trim(manifestText, " ")

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


hooks/post-receive
--