From: Robert Griesemer <gri@golang.org>
Date: Mon, 4 May 2009 22:04:32 +0000 (-0700)
Subject: - remove wrong fix
X-Git-Tag: weekly.2009-11-06~1720
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=19c239c9afc6c33d8e1a8eca0ecf3cc1a3642a45;p=gostls13.git

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

diff --git a/usr/gri/pretty/godoc.go b/usr/gri/pretty/godoc.go
index 64add11856..1d4eb5af33 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);