Fix error output for etcd-import and etcd-edit

ake-persson · Sep 28, 2015 · d1bdaad · d1bdaad
1 parent 344bef9
commit d1bdaad
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/github.com/mickep76/etcd-edit/etcd-edit.go b/src/github.com/mickep76/etcd-edit/etcd-edit.go
@@ -166,7 +166,7 @@ EDIT:
 
 		if !result.Valid() {
 			for _, e := range result.Errors() {
-				fmt.Printf("  - %s: %s\n", e.Field(), e.Description())
+				fmt.Printf("%s: %s\n", strings.Replace(e.Context().String("/"), "(root)", *dir, 1), e.Description())
 			}
 
 			fmt.Printf("Do you want to correct the changes? [yes|no]")

diff --git a/src/github.com/mickep76/etcd-import/etcd-import.go b/src/github.com/mickep76/etcd-import/etcd-import.go
@@ -120,7 +120,7 @@ func main() {
 
 		if !result.Valid() {
 			for _, e := range result.Errors() {
-				fmt.Printf("  - %s: %s\n", e.Field(), e.Description())
+				fmt.Printf("%s: %s\n", strings.Replace(e.Context().String("/"), "(root)", *dir, 1), e.Description())
 			}
 			os.Exit(1)
 		}