diff options
| author | Michael Stapelberg <michael@stapelberg.de> | 2012-07-16 22:45:24 +0200 |
|---|---|---|
| committer | Michael Stapelberg <michael@stapelberg.de> | 2012-07-16 22:45:24 +0200 |
| commit | bd4d6ed676509d6de66ebd4ff5749c00fd9e8511 (patch) | |
| tree | 601c1e92d04d5fbed05e62e44a2edb7ca9264762 | |
| parent | 0cc118f39e643637a9ce0cad33b85f70467faf7e (diff) | |
| download | golang-bd4d6ed676509d6de66ebd4ff5749c00fd9e8511.tar.gz | |
Fix godoc-symlinks.diff (godoc didn’t find docs) (Closes: #679692)
| -rw-r--r-- | debian/patches/godoc-symlinks.diff | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/debian/patches/godoc-symlinks.diff b/debian/patches/godoc-symlinks.diff index d8a1150ab..26539530a 100644 --- a/debian/patches/godoc-symlinks.diff +++ b/debian/patches/godoc-symlinks.diff @@ -1,19 +1,19 @@ --- a/src/cmd/godoc/filesystem.go +++ b/src/cmd/godoc/filesystem.go -@@ -121,7 +121,22 @@ func (root osFS) Stat(path string) (os.F +@@ -121,7 +121,22 @@ } func (root osFS) ReadDir(path string) ([]os.FileInfo, error) { - return ioutil.ReadDir(root.resolve(path)) // is sorted -+ fis, err := ioutil.ReadDir(path) // is sorted ++ dirName := root.resolve(path) ++ fis, err := ioutil.ReadDir(dirName) // is sorted + if err != nil { + return nil, err + } + // Replace symlinks with what they are pointing to -+ dirPrefix := path + "/" + for i, fi := range fis { -+ if fi.Mode() & os.ModeSymlink != 0 { -+ fi, err = os.Stat(dirPrefix + fi.Name()) ++ if fi.Mode()&os.ModeSymlink != 0 { ++ fi, err = os.Stat(filepath.Join(dirName, fi.Name())) + if err != nil { + return nil, err + } @@ -24,3 +24,4 @@ } // hasPathPrefix returns true if x == y or x == y + "/" + more + |