13647: Suppress "exit status 1" after config-check diff output.
authorTom Clegg <tclegg@veritasgenetics.com>
Wed, 10 Jul 2019 20:10:52 +0000 (16:10 -0400)
committerTom 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

index 0351ad02a1923d0a58e8d894885edcbe494ac902..7019e479cba9740c2cd1a139ddb26157d65f996b 100644 (file)
@@ -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)