From 034b895b15d4edf5a916d7f0c5d7d3bebbc43ab7 Mon Sep 17 00:00:00 2001 From: Daniel Jones Date: Sun, 3 Mar 2013 23:32:36 -0800 Subject: [PATCH] ruleset.go -> rules.go --- mk.go | 5 ++--- ruleset.go => rules.go | 0 2 files changed, 2 insertions(+), 3 deletions(-) rename ruleset.go => rules.go (100%) diff --git a/mk.go b/mk.go index ae60661..250aad0 100644 --- a/mk.go +++ b/mk.go @@ -72,7 +72,7 @@ func mkNode(g *graph, u *node) { // there's no fucking rules, dude if len(u.prereqs) == 0 { - if !u.r.attributes.virtual && !u.exists { + if !(u.r != nil && u.r.attributes.virtual) && !u.exists { wd, _ := os.Getwd() mkError(fmt.Sprintf("don't know how to make %s in %s", u.name, wd)) } @@ -134,8 +134,7 @@ func mkNode(g *graph, u *node) { } // execute the recipe, unless the prereqs failed - if finalstatus != nodeStatusFailed { - //mkPrintMessage("mking " + u.name) + if finalstatus != nodeStatusFailed && len(e.r.recipe) > 0 { if !dorecipe(u.name, u, e) { finalstatus = nodeStatusFailed } diff --git a/ruleset.go b/rules.go similarity index 100% rename from ruleset.go rename to rules.go