X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ood.go;h=7a315734287268d3f37c68fe1b82d0a91bc2579e;hb=992b7b94dd2981b4848ba17317c462e6d875e417;hp=40e6da8b3c17f535d7f03ab4d9cbe2fa3da897ca;hpb=eeda08483632b94652cf771605b71f1deb68368d;p=goredo.git

diff --git a/ood.go b/ood.go
index 40e6da8..7a31573 100644
--- a/ood.go
+++ b/ood.go
@@ -153,7 +153,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 		theirHsh := m["Hash"]
 		tracef(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep)
 
-		fd, err := os.Open(path.Join(cwd, dep))
+		inode, err := inodeFromFileByPath(path.Join(cwd, dep))
 		if err != nil {
 			if os.IsNotExist(err) {
 				tracef(CDebug, "ood: %s%s -> %s: not exists", indent, tgtOrig, dep)
@@ -162,12 +162,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 			}
 			return ood, TgtError{tgtOrig, err}
 		}
-		defer fd.Close()
 
-		inode, err := inodeFromFile(fd)
-		if err != nil {
-			return ood, TgtError{tgtOrig, err}
-		}
 		if inode.Size != theirInode.Size {
 			tracef(CDebug, "ood: %s%s -> %s: size differs", indent, tgtOrig, dep)
 			ood = true
@@ -177,7 +172,12 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 			tracef(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep)
 		} else {
 			tracef(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep)
+			fd, err := os.Open(path.Join(cwd, dep))
+			if err != nil {
+				return ood, TgtError{tgtOrig, err}
+			}
 			hsh, err := fileHash(fd)
+			fd.Close()
 			if err != nil {
 				return ood, TgtError{tgtOrig, err}
 			}
@@ -188,7 +188,6 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro
 			}
 			tracef(CDebug, "ood: %s%s -> %s: same hash", indent, tgtOrig, dep)
 		}
-		fd.Close()
 
 		if dep == tgt {
 			tracef(CDebug, "ood: %s%s -> %s: same target", indent, tgtOrig, dep)