From 60d4a81092526f61fe8bcc7f5851ee6f343017fe Mon Sep 17 00:00:00 2001 From: Fumitoshi Ukai Date: Sat, 27 Jun 2015 03:00:17 +0900 Subject: fix --ninja --- cmd/kati/main.go | 5 +---- dep.go | 6 ++---- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cmd/kati/main.go b/cmd/kati/main.go index 42ab71f..5fb5f23 100644 --- a/cmd/kati/main.go +++ b/cmd/kati/main.go @@ -299,10 +299,7 @@ func katiMain(args []string) error { } if generateNinja { - err = kati.GenerateNinja(g, gomaDir) - if err != nil { - return err - } + return kati.GenerateNinja(g, gomaDir) } if syntaxCheckOnlyFlag { diff --git a/dep.go b/dep.go index ea4ed0a..77d4587 100644 --- a/dep.go +++ b/dep.go @@ -312,8 +312,7 @@ func (db *depBuilder) buildPlan(output string, neededBy string, tsvs Vars) (*Dep actualInputs = append(actualInputs, input) db.trace = append(db.trace, input) - var err error - n, err = db.buildPlan(input, output, tsvs) + n, err := db.buildPlan(input, output, tsvs) db.trace = db.trace[0 : len(db.trace)-1] if err != nil { return nil, err @@ -325,8 +324,7 @@ func (db *depBuilder) buildPlan(output string, neededBy string, tsvs Vars) (*Dep for _, input := range rule.orderOnlyInputs { db.trace = append(db.trace, input) - var err error - n, err = db.buildPlan(input, output, tsvs) + n, err := db.buildPlan(input, output, tsvs) db.trace = db.trace[0 : len(db.trace)-1] if err != nil { return nil, err -- cgit v1.2.3