[ARVADOS] updated: aceb2d1ed239fa82fcb8bb352b632a8d92251dac

[Git user]

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

       via  aceb2d1ed239fa82fcb8bb352b632a8d92251dac (commit)
      from  a340487a7d406e73e51479a765a3d08bdb92b8d0 (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 aceb2d1ed239fa82fcb8bb352b632a8d92251dac
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue May 16 10:38:55 2017 -0400

    11693: Only check collection mounts when determining whether to call
    getCollectionManifestForPath to merge files into output collection.  Remove
    redundant assignment of outputSuffix.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index 4676a4f..c56dbc5 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -921,8 +921,10 @@ func (runner *ContainerRunner) CaptureOutput() error {
 
 	// Pre-populate output from the configured mount points
 	var binds []string
-	for bind, _ := range runner.Container.Mounts {
-		binds = append(binds, bind)
+	for bind, mnt := range runner.Container.Mounts {
+		if mnt.Kind == "collection" {
+			binds = append(binds, bind)
+		}
 	}
 	sort.Strings(binds)
 
@@ -949,17 +951,16 @@ func (runner *ContainerRunner) CaptureOutput() error {
 				return err
 			}
 
+			// get path relative to output dir
 			outputSuffix := path[len(runner.HostOutputDir):]
 
 			if strings.HasPrefix(tgt, "/") {
 				// go through mounts and try reverse map to collection reference
 				for _, bind := range binds {
 					mnt := runner.Container.Mounts[bind]
-					if tgt == bind || strings.HasPrefix(tgt, bind+"/") && mnt.Kind == "collection" {
+					if tgt == bind || strings.HasPrefix(tgt, bind+"/") {
 						// get path relative to bind
 						targetSuffix := tgt[len(bind):]
-						// get path relative to output dir
-						outputSuffix := path[len(runner.HostOutputDir):]
 
 						// Copy mount and adjust the path to add path relative to the bind
 						adjustedMount := mnt

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


hooks/post-receive
--