From b33311531413d0a59a840fc86480f11515152455 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Mon, 9 Dec 2019 16:35:19 -0800
Subject: [PATCH] kyaml: fix error handling

---
 cmd/config/cmd/cmdwrap.go  | 6 +-----
 cmd/config/cmd/cmdxargs.go | 2 +-
 cmd/config/cmd/run-fns.go  | 3 +--
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/cmd/config/cmd/cmdwrap.go b/cmd/config/cmd/cmdwrap.go
index 822a5e3c2..6bb62ef87 100644
--- a/cmd/config/cmd/cmdwrap.go
+++ b/cmd/config/cmd/cmdwrap.go
@@ -135,9 +135,5 @@ func (r *WrapRunner) runE(c *cobra.Command, args []string) error {
 			Writer:                c.OutOrStdout(),
 			WrappingKind:          kio.ResourceListKind,
 			WrappingAPIVersion:    kio.ResourceListAPIVersion}}}.Execute()
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return handleError(c, err)
 }
diff --git a/cmd/config/cmd/cmdxargs.go b/cmd/config/cmd/cmdxargs.go
index c9e298f40..1b2b42478 100644
--- a/cmd/config/cmd/cmdxargs.go
+++ b/cmd/config/cmd/cmdxargs.go
@@ -211,7 +211,7 @@ func (r *XArgsRunner) runE(c *cobra.Command, _ []string) error {
 		return err
 	}
 
-	return run.Run()
+	return handleError(c, run.Run())
 }
 
 func parseYNode(node *yaml.Node) string {
diff --git a/cmd/config/cmd/run-fns.go b/cmd/config/cmd/run-fns.go
index dc67c696b..db2919207 100644
--- a/cmd/config/cmd/run-fns.go
+++ b/cmd/config/cmd/run-fns.go
@@ -52,6 +52,5 @@ func (r *RunFnRunner) runE(c *cobra.Command, args []string) error {
 	if r.DryRun {
 		rec.Output = c.OutOrStdout()
 	}
-	return rec.Execute()
-
+	return handleError(c, rec.Execute())
 }