From: Andrew Gerrand <adg@golang.org>
Date: Mon, 12 Mar 2012 04:55:39 +0000 (+1100)
Subject: cmd/godoc: always include /doc files in union filesystems
X-Git-Tag: weekly.2012-03-13~47
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=92d4af301e5c69b066b75475b3fce24e4fa51ab3;p=gostls13.git

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
---

diff --git a/src/cmd/godoc/filesystem.go b/src/cmd/godoc/filesystem.go
index b1913cdd99..869e23ca25 100644
--- a/src/cmd/godoc/filesystem.go
+++ b/src/cmd/godoc/filesystem.go
@@ -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