From 6cdf0a1eab8c038b439543f45aff2bcf660b0eac Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Fri, 17 Feb 2012 11:01:16 -0800 Subject: [PATCH] godoc: don't print spurious suggestion when running "go doc foo" Fixes #3041. R=rsc CC=golang-dev https://golang.org/cl/5671087 --- src/cmd/godoc/main.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cmd/godoc/main.go b/src/cmd/godoc/main.go index e5e81c6dfa..96b729978f 100644 --- 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() { -- 2.50.0