vendor: update vendored upspin.io to bcbe577
This includes updates to templates in serverutil/frontend
and a fix to the version package.
Change-Id: Idfe6c625c11dd2be658fb41f49961ea4e48dcc1d
Reviewed-on: https://upspin-review.googlesource.com/16121
Reviewed-by: Rob Pike <r@golang.org>
diff --git a/Gopkg.lock b/Gopkg.lock
index e9bb654..37c3101 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -95,7 +95,7 @@
branch = "master"
name = "upspin.io"
packages = ["access","bind","cache","client","client/clientutil","client/file","cloud/https","cloud/mail","cloud/mail/sendgrid","cloud/storage","config","dir/inprocess","dir/remote","dir/server","dir/server/serverlog","dir/server/tree","dir/unassigned","errors","factotum","flags","key/inprocess","key/remote","key/server","key/sha256key","key/transports","key/unassigned","key/usercache","log","metric","pack","pack/ee","pack/eeintegrity","pack/internal","pack/packutil","pack/plain","path","rpc","rpc/dirserver","rpc/keyserver","rpc/local","rpc/storeserver","serverutil","serverutil/dirserver","serverutil/frontend","serverutil/keyserver","serverutil/perm","serverutil/signup","serverutil/storeserver","serverutil/upspinserver","serverutil/web","shutdown","store/inprocess","store/remote","store/server","store/transports","store/unassigned","subcmd","test/testutil","transports","upspin","upspin/proto","user","valid","version"]
- revision = "8d5c10c228a14b85a41acc0889e1b880c5cca450"
+ revision = "bcbe577d41646dffd734f21cf604a7cbeeafa634"
[solve-meta]
analyzer-name = "dep"
diff --git a/vendor/upspin.io/serverutil/frontend/frontend.go b/vendor/upspin.io/serverutil/frontend/frontend.go
index c7a0216..994e239 100644
--- a/vendor/upspin.io/serverutil/frontend/frontend.go
+++ b/vendor/upspin.io/serverutil/frontend/frontend.go
@@ -154,8 +154,9 @@
}
type pageData struct {
- Title string
- Content interface{}
+ Title string
+ Content interface{}
+ FileName string
}
func (s *server) handleDoc(w http.ResponseWriter, r *http.Request) {
@@ -191,8 +192,9 @@
return
}
if err := s.tmpl.doc.Execute(w, pageData{
- Title: s.docTitle[fn] + " · Upspin",
- Content: template.HTML(b),
+ Title: s.docTitle[fn] + " · Upspin",
+ Content: template.HTML(b),
+ FileName: fn,
}); err != nil {
log.Error.Printf("Error executing doc content template: %s", err)
return
diff --git a/vendor/upspin.io/version/make_version.go b/vendor/upspin.io/version/make_version.go
index e83ea42..c1d35be 100644
--- a/vendor/upspin.io/version/make_version.go
+++ b/vendor/upspin.io/version/make_version.go
@@ -27,7 +27,7 @@
return
}
- output := fmt.Sprintf(outputFormat, time.Now().In(time.UTC).Format(time.Stamp+" UTC"), version)
+ output := fmt.Sprintf(outputFormat, time.Now().In(time.UTC).Format(time.UnixDate), version)
err := ioutil.WriteFile("git_version.go", []byte(output), 0664)
if err != nil {
@@ -47,7 +47,7 @@
func init() {
var err error
- BuildTime, err = time.Parse(time.Stamp + " UTC", %[1]q)
+ BuildTime, err = time.Parse(time.UnixDate, %[1]q)
if err != nil {
panic(err)
}
diff --git a/vendor/upspin.io/version/version.go b/vendor/upspin.io/version/version.go
index 4544bb5..741e80e 100644
--- a/vendor/upspin.io/version/version.go
+++ b/vendor/upspin.io/version/version.go
@@ -26,7 +26,7 @@
if GitSHA == "" {
return "devel\n"
}
- str := fmt.Sprintf("Build time: %s\n", BuildTime.In(time.UTC).Format(time.Stamp+" UTC"))
+ str := fmt.Sprintf("Build time: %s\n", BuildTime.In(time.UTC).Format(time.Stamp+" 2006 UTC"))
str += fmt.Sprintf("Git hash: %s\n", GitSHA)
return str
}
