storage/app: fix merge error in upload.go
Change-Id: I6220ec86c80c07899b1e511753a07da54e5e7bbd
Reviewed-on: https://go-review.googlesource.com/35153
Reviewed-by: Russ Cox <rsc@golang.org>
diff --git a/storage/app/upload.go b/storage/app/upload.go
index c24d6ae..d66de6c 100644
--- a/storage/app/upload.go
+++ b/storage/app/upload.go
@@ -117,18 +117,18 @@
meta := map[string]string{
"uploadid": upload.ID,
- "fileid": fmt.Sprintf("%s/%d", upload.ID, filenum),
+ "fileid": fmt.Sprintf("%s/%d", upload.ID, i),
"uploadtime": uploadtime,
}
- name := p.FileName()
+ name = p.FileName()
if slash := strings.LastIndexAny(name, `/\`); slash >= 0 {
name = name[slash+1:]
}
if name != "" {
- m["uploadfile"] = name
+ meta["uploadfile"] = name
}
if user != "" {
- m["by"] = user
+ meta["by"] = user
}
// We need to do two things with the incoming data:
