← Back to branch summary

~themue/juju-core/053-env-more-script-friendly

« back to all changes in this revision

Viewing changes to cmd/cmd.go

Merge trunk and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/cmd.go
158
158
        }
159
159
        if err := c.Run(ctx); err != nil {
160
160
                if err != ErrSilent {
161
 
                        log.Errorf("%s command failed: %s\n", c.Info().Name, err)
 
161
                        log.Errorf("command failed: %s\n", err)
162
162
                        fmt.Fprintf(ctx.Stderr, "error: %v\n", err)
163
163
                }
164
164
                return 1