From c0bcb8dff3a7ca04d65a3d89ab1f0d64bbb0217c Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Mon, 15 Jun 2015 19:56:56 -0700 Subject: [PATCH] Fixed a basic UI regression due to a recent godep update In one of the latest docker UI updates, the flags structure expects to have a ShortUsage function. Without that any UI event that triggers an short usage panics. Signed-off-by: Madhu Venugopal --- libnetwork/client/client.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libnetwork/client/client.go b/libnetwork/client/client.go index bb2aedc74a..c5713b01b3 100644 --- a/libnetwork/client/client.go +++ b/libnetwork/client/client.go @@ -83,6 +83,10 @@ func (cli *NetworkCli) Subcmd(chain, name, signature, description string, exitOn } flags := flag.NewFlagSet(name, errorHandling) flags.Usage = func() { + flags.ShortUsage() + flags.PrintDefaults() + } + flags.ShortUsage = func() { options := "" if signature != "" { signature = " " + signature @@ -92,7 +96,6 @@ func (cli *NetworkCli) Subcmd(chain, name, signature, description string, exitOn } fmt.Fprintf(cli.out, "\nUsage: %s %s%s%s\n\n%s\n\n", chain, name, options, signature, description) flags.SetOutput(cli.out) - flags.PrintDefaults() } return flags }