github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Align version output and minor code cleanup

Browse Source 
This patch changes the output of `ctr version` to align version and revision.
It also changes `.Printf()` to `.Println()`, to make the code slightly easier
to read.

Before this change:

    $ ctr version
    Client:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version: v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

With this patch applied:

    $ ctr version
    Client:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

    Server:
      Version:  v1.0.0-beta.2-132-g564600e.m
      Revision: 564600ee79aefb0f24cbcecc90d4388bd0ea59de.m

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2017-11-03 11:26:46 +01:00
parent 99595e0b84
commit 65d5b8b937
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/ctr/commands/version/version.go
View File

@ -9,14 +9,14 @@ import (
"github.com/urfave/cli" "github.com/urfave/cli"
) )
// Command is a cli ommand to output the client and containerd server version // Command is a cli command to output the client and containerd server version
var Command = cli.Command{ var Command = cli.Command{
Name: "version", Name: "version",
Usage: "print the client and server versions", Usage: "print the client and server versions",
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
fmt.Println("Client:") fmt.Println("Client:")
fmt.Printf(" Version: %s\n", version.Version) fmt.Println(" Version: ", version.Version)
fmt.Printf(" Revision: %s\n", version.Revision) fmt.Println(" Revision:", version.Revision)
fmt.Println("") fmt.Println("")
client, ctx, cancel, err := commands.NewClient(context) client, ctx, cancel, err := commands.NewClient(context)
if err != nil { if err != nil {
@ -28,13 +28,13 @@ var Command = cli.Command{
return err return err
} }
fmt.Println("Server:") fmt.Println("Server:")
fmt.Printf(" Version: %s\n", v.Version) fmt.Println(" Version: ", v.Version)
fmt.Printf(" Revision: %s\n", v.Revision) fmt.Println(" Revision:", v.Revision)
if v.Version != version.Version { if v.Version != version.Version {
fmt.Fprintf(os.Stderr, "WARNING: version mismatch\n") fmt.Fprintln(os.Stderr, "WARNING: version mismatch")
} }
if v.Revision != version.Revision { if v.Revision != version.Revision {
fmt.Fprintf(os.Stderr, "WARNING: revision mismatch\n") fmt.Fprintln(os.Stderr, "WARNING: revision mismatch")
} }
return nil return nil
}, },