From 19c239c9afc6c33d8e1a8eca0ecf3cc1a3642a45 Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Mon, 4 May 2009 15:04:32 -0700 Subject: [PATCH] - remove wrong fix (this corresponds to the currently running version of godoc) R=r DELTA=11 (0 added, 10 deleted, 1 changed) OCL=28238 CL=28238 --- usr/gri/pretty/godoc.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/usr/gri/pretty/godoc.go b/usr/gri/pretty/godoc.go index 64add118560..1d4eb5af336 100644 --- a/usr/gri/pretty/godoc.go +++ b/usr/gri/pretty/godoc.go @@ -554,17 +554,7 @@ func (p *pakDesc) Doc() (*doc.PackageDoc, *parseErrors) { if i == 0 { // first file - initialize doc - // canonicalize importpath - // (e.g. such that "template/template" becomes just "template") - // TODO This should not be needed here as similar functionality - // is elsewhere, but w/o this fix the output is incorrect - // for, say: "godoc template/template". Temporary work-around. - path := p.importpath; - dir, name := pathutil.Split(pathutil.Clean(path)); - if name == prog.Name.Value { - path = pathutil.Clean(dir); - } - r.Init(prog.Name.Value, path); + r.Init(prog.Name.Value, p.importpath); } i++; r.AddProgram(prog);