Browse Source

Pick up dirs without a CurrentFiler

Jakob Borg 11 years ago
parent
commit
45dfd616cb
1 changed files with 19 additions and 18 deletions
  1. 19 18
      scanner/walk.go

+ 19 - 18
scanner/walk.go

@@ -176,26 +176,27 @@ func (w *Walker) walkAndHashFiles(res *[]protocol.FileInfo, ign map[string][]str
 						l.Debugln("unchanged:", cf)
 					}
 					*res = append(*res, cf)
-				} else {
-					var flags uint32 = protocol.FlagDirectory
-					if w.IgnorePerms {
-						flags |= protocol.FlagNoPermBits | 0777
-					} else {
-						flags |= uint32(info.Mode() & os.ModePerm)
-					}
-					f := protocol.FileInfo{
-						Name:     rn,
-						Version:  lamport.Default.Tick(0),
-						Flags:    flags,
-						Modified: info.ModTime().Unix(),
-					}
-					if debug {
-						l.Debugln("dir:", cf, f)
-					}
-					*res = append(*res, f)
+					return nil
 				}
-				return nil
 			}
+
+			var flags uint32 = protocol.FlagDirectory
+			if w.IgnorePerms {
+				flags |= protocol.FlagNoPermBits | 0777
+			} else {
+				flags |= uint32(info.Mode() & os.ModePerm)
+			}
+			f := protocol.FileInfo{
+				Name:     rn,
+				Version:  lamport.Default.Tick(0),
+				Flags:    flags,
+				Modified: info.ModTime().Unix(),
+			}
+			if debug {
+				l.Debugln("dir:", f)
+			}
+			*res = append(*res, f)
+			return nil
 		}
 
 		if info.Mode().IsRegular() {