X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=ood.go;h=0552e2016112a46b037976dbfc88f26adf677b2a;hb=312d2fc4059d8ad03c7fa5b853cdbcb7091e8e71;hp=e75dd43c4f7185dd17b7047d326414a6af9b89cd;hpb=ebd96d2c56c742d9d00bccb9faee5fc1a7db664a;p=goredo.git diff --git a/ood.go b/ood.go index e75dd43..0552e20 100644 --- a/ood.go +++ b/ood.go @@ -1,5 +1,5 @@ /* -goredo -- redo implementation on pure Go +goredo -- djb's redo implementation on pure Go Copyright (C) 2020-2021 Sergey Matveev This program is free software: you can redistribute it and/or modify @@ -110,11 +110,11 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro for _, m := range depInfo.ifchanges { dep := m["Target"] if dep == "" { - return ood, TgtErr{tgtOrig, errors.New("invalid format of .dep: missing Target")} + return ood, TgtErr{tgtOrig, errors.New("invalid format of .rec: missing Target")} } theirInode, err := inodeFromRec(m) if err != nil { - return ood, TgtErr{tgtOrig, fmt.Errorf("invalid format of .dep: %v", err)} + return ood, TgtErr{tgtOrig, fmt.Errorf("invalid format of .rec: %v", err)} } theirHsh := m["Hash"] trace(CDebug, "ood: %s%s -> %s: checking", indent, tgtOrig, dep) @@ -139,7 +139,7 @@ func isOOD(cwd, tgtOrig string, level int, seen map[string]struct{}) (bool, erro ood = true goto Done } - if inode.Equals(theirInode) { + if InodeTrust && inode.Equals(theirInode) { trace(CDebug, "ood: %s%s -> %s: same inode", indent, tgtOrig, dep) } else { trace(CDebug, "ood: %s%s -> %s: inode differs", indent, tgtOrig, dep)