Merge pull request #317 from hatappi/master

andreynering · web-flow · commit c36f0f6f7ff7 · 2020-05-01T15:38:16.000-03:00
suppress context errors when use watch option
diff --git a/watch.go b/watch.go
@@ -91,6 +91,10 @@ func (e *Executor) watchTasks(calls ...taskfile.Call) error {
 }
 
 func isContextError(err error) bool {
+	if taskRunErr, ok := err.(*taskRunError); ok {
+		err = taskRunErr.err
+	}
+
 	return err == context.Canceled || err == context.DeadlineExceeded
 }
 

Original file line number	Diff line number	Diff line change
`@@ -91,6 +91,10 @@ func (e *Executor) watchTasks(calls ...taskfile.Call) error {`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`func isContextError(err error) bool {`
	`94`	`+ if taskRunErr, ok := err.(*taskRunError); ok {`
	`95`	`+ err = taskRunErr.err`
	`96`	`+ }`
	`97`	`+`
`94`	`98`	`return err == context.Canceled \|\| err == context.DeadlineExceeded`
`95`	`99`	`}`
`96`	`100`