From f0e511510a0500998ceed972190547a89a69a924 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Wed, 15 Nov 2017 12:35:19 +0000
Subject: [PATCH] Don't print a message on flag not found

---
 prog/weaveutil/db_flag.go | 2 +-
 prog/weaveutil/main.go    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/prog/weaveutil/db_flag.go b/prog/weaveutil/db_flag.go
index 0beeb48e..6d32587b 100644
--- a/prog/weaveutil/db_flag.go
+++ b/prog/weaveutil/db_flag.go
@@ -27,7 +27,7 @@ func getDBFlag(args []string) error {
 		return err
 	}
 	if !nameFound {
-		return fmt.Errorf("Flag %q not found", flagName)
+		return fmt.Errorf("")
 	}
 	fmt.Print(value)
 	return nil
diff --git a/prog/weaveutil/main.go b/prog/weaveutil/main.go
index b638a80c..deb45d9d 100644
--- a/prog/weaveutil/main.go
+++ b/prog/weaveutil/main.go
@@ -85,7 +85,9 @@ func main() {
 		os.Exit(1)
 	}
 	if err := cmd(os.Args[2:]); err != nil {
-		fmt.Fprintln(os.Stderr, err)
+		if err.Error() != "" {
+			fmt.Fprintln(os.Stderr, err)
+		}
 		os.Exit(1)
 	}
 }