summaryrefslogtreecommitdiff
path: root/debian/patches/golang-1.3-compat
blob: b0e4f3741384f800855ba0de7e228fef5c2f0941 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
Index: planr.git/fs.go
===================================================================
--- planr.git.orig/fs.go
+++ planr.git/fs.go
@@ -220,7 +220,7 @@ func collectFromDir(
 
   // Read the entries in this directory
   for {
-    dirs, err := fp.ReadDir(100)
+    dirs, err := fp.Readdir(100)
     if err == io.EOF {
       break
     } else if err != nil {
@@ -229,8 +229,8 @@ func collectFromDir(
 
 
     for _, ent := range dirs {
-      child := path.Join(dir, ent.Name())
       nm := ent.Name()
+      child := path.Join(dir, nm)
 
       if ent.IsDir() {
         collectFromDir(child, defaults, cfgs, units)