From ed15e73d08761adefbad12d18f30e64eb3d4d8bf Mon Sep 17 00:00:00 2001 From: Cedric Staub Date: Mon, 12 Dec 2016 12:33:30 -0800 Subject: [PATCH 1/2] Return error instead of printing to stderr in lib --- lib/certs.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/certs.go b/lib/certs.go index c1146a4..2fc24c5 100644 --- a/lib/certs.go +++ b/lib/certs.go @@ -196,7 +196,7 @@ func readCertsFromStream(reader io.Reader, filename string, format string, passw } blocks, err := pkcs12.ToPEM(data, password("")) if err != nil || len(blocks) == 0 { - fmt.Fprint(os.Stderr, "keystore appears to be empty or password was incorrect\n") + return fmt.Errorf("keystore appears to be empty or password was incorrect\n") } for _, block := range blocks { block.Headers = mergeHeaders(block.Headers, headers) From fe9b8974480d90ac212d28c9182ddac11706faca Mon Sep 17 00:00:00 2001 From: Cedric Staub Date: Mon, 12 Dec 2016 12:35:45 -0800 Subject: [PATCH 2/2] Fix cram install in travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 836260a..5d6bfd9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ go: before_install: - go get github.com/Masterminds/glide - - pip install cram --user `whoami` + - pip install cram --user install: - go build .