[Pkg-golang-commits] [SCM] Packaging for Google Go branch, debian-sid, updated. debian/2%1.0.2-1-6-gbd4d6ed
Michael Stapelberg
michael at stapelberg.de
Mon Jul 16 20:50:27 UTC 2012
The following commit has been merged in the debian-sid branch:
commit bd4d6ed676509d6de66ebd4ff5749c00fd9e8511
Author: Michael Stapelberg <michael at stapelberg.de>
Date: Mon Jul 16 22:45:24 2012 +0200
Fix godoc-symlinks.diff (godoc didn’t find docs) (Closes: #679692)
diff --git a/debian/patches/godoc-symlinks.diff b/debian/patches/godoc-symlinks.diff
index d8a1150..2653953 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
+
--
Packaging for Google Go
More information about the pkg-golang-commits
mailing list