godoc: don't print spurious suggestion when running "go doc foo"

Fixes #3041.

R=rsc
CC=golang-dev
https://golang.org/cl/5671087

diff --git a/src/cmd/godoc/main.go b/src/cmd/godoc/main.go
index e5e81c6dfa19b63a7a5e1b3c19ae648ba2feb078..96b729978f76ac371766dfdfb8b0375fc5474044 100644 (file)
--- a/src/cmd/godoc/main.go
+++ b/src/cmd/godoc/main.go
@@ -417,11 +417,13 @@ func main() {
                info = pkgHandler.getPageInfo(abspath, relpath, "", mode)
        }
 
-       // second, try as command
+       // second, try as command unless the path is absolute
+       // (the go command invokes godoc w/ absolute paths; don't override)
+       var cinfo PageInfo
        if !filepath.IsAbs(path) {
                abspath = absolutePath(path, cmdHandler.fsRoot)
+               cinfo = cmdHandler.getPageInfo(abspath, relpath, "", mode)
        }
-       cinfo := cmdHandler.getPageInfo(abspath, relpath, "", mode)
 
        // determine what to use
        if info.IsEmpty() {