[ARVADOS] updated: b702c499e162c3cce7407ecd52197aa5f2bbae63

git at public.curoverse.com git at public.curoverse.com
Mon Jan 4 14:52:34 EST 2016


Summary of changes:
 sdk/go/crunchrunner/upload.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

       via  b702c499e162c3cce7407ecd52197aa5f2bbae63 (commit)
      from  680525ea705aeb24a82699c8c57dbc26c797a775 (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 b702c499e162c3cce7407ecd52197aa5f2bbae63
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jan 4 14:52:31 2016 -0500

    8080: Fix crunchrunner to use FileToken struct.

diff --git a/sdk/go/crunchrunner/upload.go b/sdk/go/crunchrunner/upload.go
index 06a6678..e571bec 100644
--- a/sdk/go/crunchrunner/upload.go
+++ b/sdk/go/crunchrunner/upload.go
@@ -131,7 +131,7 @@ func (m *ManifestWriter) WalkFunc(path string, info os.FileInfo, err error) erro
 	stream.offset += count
 
 	stream.ManifestStream.FileTokens = append(stream.ManifestStream.FileTokens,
-		fmt.Sprintf("%v:%v:%v", fileStart, count, fn))
+		manifest.FileToken{uint64(fileStart), uint64(count), fn})
 
 	return nil
 }
@@ -191,9 +191,9 @@ func (m *ManifestWriter) ManifestText() string {
 		}
 		for _, f := range v.FileTokens {
 			buf.WriteString(" ")
-			f = strings.Replace(f, " ", "\\040", -1)
-			f = strings.Replace(f, "\n", "", -1)
-			buf.WriteString(f)
+			name := strings.Replace(f.Name, " ", "\\040", -1)
+			name = strings.Replace(name, "\n", "", -1)
+			buf.WriteString(fmt.Sprintf("%d:%d:%s", f.SegPos, f.SegLen, name))
 		}
 		buf.WriteString("\n")
 	}

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list