Merge branch 'peterlits'

let it works in test
akamensky · May 16, 2020 · e62f62f · e62f62f
2 parents 89a0f45 + 3a5de4f
commit e62f62f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/argparse.go b/argparse.go
@@ -629,7 +629,9 @@ func (o *Command) Usage(msg interface{}) string {
 		return result
 	}
     // add one more empty line to split error msg and usage message.
-    result += "\n"
+    if result != "" {
+        result += "\n"
+    }
 
 	//collect info about Preceding Commands into chain and arguments
 	o.getPrecedingCommands(&chain, &arguments)

diff --git a/argparse_test.go b/argparse_test.go
@@ -2243,6 +2243,7 @@ func TestFloatFail1(t *testing.T) {
 }
 
 var pUsageString = `test string
+
 usage: prog [-h|--help]
 description:
   program description
@@ -2269,6 +2270,7 @@ func (s s) String() string {
 }
 
 var pUsageStringer = `stringer message
+
 usage: prog [-h|--help]
 description:
   program description