Merge pull request containerd#548 from fate-grand-order/fixed

Use errors.New() directly to output the error message

cmd/ctr/run.go

@@ -2,7 +2,6 @@ package main
 
 import (
 	"encoding/json"
-	"fmt"
 	"io/ioutil"
 	"path/filepath"
 
@@ -17,6 +16,7 @@ import (
 	protobuf "github.com/gogo/protobuf/types"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/urfave/cli"
+	"github.com/pkg/errors"
 )
 
 var rwm = "rwm"
@@ -175,7 +175,7 @@ var runCommand = cli.Command{
 	Action: func(context *cli.Context) error {
 		id := context.String("id")
 		if id == "" {
-			return fmt.Errorf("container id must be provided")
+			return errors.New("container id must be provided")
 		}
 
 		containers, err := getExecutionService(context)

cmd/dist/ingest.go

@@ -2,13 +2,13 @@ package main
 
 import (
 	contextpkg "context"
-	"fmt"
 	"os"
 
 	contentapi "github.com/docker/containerd/api/services/content"
 	"github.com/docker/containerd/content"
 	"github.com/opencontainers/go-digest"
 	"github.com/urfave/cli"
+	"github.com/pkg/errors"
 )
 
 var ingestCommand = cli.Command{
@@ -48,7 +48,7 @@ var ingestCommand = cli.Command{
 		}
 
 		if ref == "" {
-			return fmt.Errorf("must specify a transaction reference")
+			return errors.New("must specify a transaction reference")
 		}
 
 		ingester := content.NewIngesterFromClient(contentapi.NewContentClient(conn))

cmd/dist/list.go

@@ -54,7 +54,7 @@ var listCommand = cli.Command{
 			tw := tabwriter.NewWriter(os.Stdout, 1, 8, 1, '\t', 0)
 			defer tw.Flush()
 
-			fmt.Fprintf(tw, "DIGEST\tSIZE\tAGE\n")
+			fmt.Fprintln(tw, "DIGEST\tSIZE\tAGE")
 			walkFn = func(path string, fi os.FileInfo, dgst digest.Digest) error {
 				fmt.Fprintf(tw, "%s\t%s\t%s\n",
 					dgst,