[ARVADOS] updated: 80ce9f9d06128195a1f8506fc5f32b6fb589cfcc

[Git user]

Summary of changes:
 services/crunch-run/upload.go | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

       via  80ce9f9d06128195a1f8506fc5f32b6fb589cfcc (commit)
      from  941502322ccea097e1944972d3647182cd1b6268 (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 80ce9f9d06128195a1f8506fc5f32b6fb589cfcc
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Oct 2 16:07:18 2017 -0400

    12183: Simplify walking symlinks in upload.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/services/crunch-run/upload.go b/services/crunch-run/upload.go
index 7b13109..3127683 100644
--- a/services/crunch-run/upload.go
+++ b/services/crunch-run/upload.go
@@ -19,7 +19,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
@@ -288,14 +287,7 @@ func (m *WalkUpload) WalkFunc(path string, info os.FileInfo, err error) error {
 			// here.  We've previously checked that they stay in
 			// the output directory and don't result in an endless
 			// loop.
-			var rd []os.FileInfo
-			rd, err = ioutil.ReadDir(path)
-			if err != nil {
-				return err
-			}
-			for _, ent := range rd {
-				err = filepath.Walk(filepath.Join(path, ent.Name()), m.WalkFunc)
-			}
+			filepath.Walk(path+"/.", m.WalkFunc)
 		}
 	}
 

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


hooks/post-receive
--