Update tfexec/errors.go

hashicorp · Sep 16, 2020 · 4513cac · 4513cac
1 parent 3649e43
commit 4513cac
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/tfexec/errors.go b/tfexec/errors.go
@@ -28,10 +28,15 @@ var (
 	tfVersionMismatchConstraintRegexp = regexp.MustCompile(`required_version = "(.+)"|Required version: (.+)\b`)
 )
 
+<<<<<<< HEAD
 func (tf *Terraform) parseError(err error, stderr string) error {
 	// if not an ExitError, just return it, do not try to parse
 	var ee *exec.ExitError
 	if !errors.As(err, &ee) {
+=======
+func parseError(err error, stderr string) error {
+	if _, ok := err.(*exec.ExitError); !ok {
+>>>>>>> Update tfexec/errors.go
 		return err
 	}