Commit 92d4af30 authored by Andrew Gerrand's avatar Andrew Gerrand

cmd/godoc: always include /doc files in union filesystems

Makes Path rewrites work, as the metadata was never being scanned.

Fixes #3282.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5783076
parent 2ae86058
......@@ -420,11 +420,17 @@ func (ns nameSpace) ReadDir(path string) ([]os.FileInfo, error) {
first = dir
}
useFiles := false
// Always include all files under /doc.
if path == "/doc" || strings.HasPrefix(path, "/doc/") {
useFiles = true // always include docs
}
// If we don't yet have Go files in 'all' and this directory
// has some, add all the files from this directory.
// Otherwise, only add subdirectories.
useFiles := false
if !haveGo {
if !useFiles && !haveGo {
for _, d := range dir {
if strings.HasSuffix(d.Name(), ".go") {
useFiles = true
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment