projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5f943cd
)
13647: Suppress "exit status 1" after config-check diff output.
author
Tom Clegg <tclegg@veritasgenetics.com>
Wed, 10 Jul 2019 20:10:52 +0000
(16:10 -0400)
committer
Tom Clegg <tclegg@veritasgenetics.com>
Thu, 11 Jul 2019 14:21:21 +0000
(10:21 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>
lib/config/cmd.go
patch
|
blob
|
history
diff --git
a/lib/config/cmd.go
b/lib/config/cmd.go
index 0351ad02a1923d0a58e8d894885edcbe494ac902..7019e479cba9740c2cd1a139ddb26157d65f996b 100644
(file)
--- a/
lib/config/cmd.go
+++ b/
lib/config/cmd.go
@@
-124,6
+124,7
@@
func (checkCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
if bytes.HasPrefix(diff, []byte("--- ")) {
fmt.Fprintln(stdout, "Your configuration is relying on deprecated entries. Suggest making the following changes.")
stdout.Write(diff)
+ err = nil
return 1
} else if len(diff) > 0 {
fmt.Fprintf(stderr, "Unexpected diff output:\n%s", diff)