default.do-s must not depend on themselves

[goredo.git] / do.go

diff --git a/do.go b/do.go
index 516b1438c28d5751d477f645c57c45aae47f0956..c4a569665b51f029aa9161d2cf03238fa6ce20e0 100644 (file)
--- a/do.go
+++ b/do.go
@@ -60,7 +60,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
                        doFile = strings.Join(append(
                                []string{"default"}, append(exts, "do")...,
                        ), ".")
-                       if len(levels) > 0 || doFile != doFileOrig {
+                       if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
                                exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
                                if err != nil {
                                        return "", 0, err
@@ -72,7 +72,7 @@ func findDo(fdDep *os.File, cwd, tgt string) (string, int, error) {
                        exts = exts[1:]
                }
                doFile = "default.do"
-               if len(levels) > 0 || doFile != doFileOrig {
+               if len(levels) > 0 || (doFile != doFileOrig && doFile != tgt) {
                        exists, err = existsDo(fdDep, cwd, path.Join(updir, doFile))
                        if err != nil {
                                return "", 0, err