vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #401 from gliptak/warnings1

Browse source 
Correct vet warnings
This commit is contained in:
Kenfe-Mickaël Laventure 2017-01-05 13:02:10 -08:00 committed by GitHub
commit 017d4b77f8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/containerd/main.go
View file

@ -135,7 +135,7 @@ high performance container runtime
ctx = log.WithModule(ctx, "execution") ctx = log.WithModule(ctx, "execution")
ctx = events.WithPoster(ctx, events.GetNATSPoster(nec)) ctx = events.WithPoster(ctx, events.GetNATSPoster(nec))
default: default:
fmt.Println("Unknown type: %#v", info.Server) fmt.Printf("Unknown type: %#v\n", info.Server)
} }
return handler(ctx, req) return handler(ctx, req)
} }

4
execution/service.go
View file

@ -160,8 +160,8 @@ func (s *Service) StartProcess(ctx context.Context, r *api.StartProcessRequest)
spec := specs.Process{ spec := specs.Process{
Terminal: r.Process.Terminal, Terminal: r.Process.Terminal,
ConsoleSize: specs.Box{ ConsoleSize: specs.Box{
80, Height: 80,
80, Width: 80,
}, },
Args: r.Process.Args, Args: r.Process.Args,
Env: r.Process.Env, Env: r.Process.Env,

4
snapshot/btrfs_test.go
View file

@ -32,12 +32,12 @@ func TestBtrfs(t *testing.T) {
for _, mount := range mounts { for _, mount := range mounts {
if mount.Type != "btrfs" { if mount.Type != "btrfs" {
t.Fatal("wrong mount type: %v != btrfs", mount.Type) t.Fatalf("wrong mount type: %v != btrfs", mount.Type)
} }
// assumes the first, maybe incorrect in the future // assumes the first, maybe incorrect in the future
if !strings.HasPrefix(mount.Options[0], "subvolid=") { if !strings.HasPrefix(mount.Options[0], "subvolid=") {
t.Fatal("no subvolid option in %v", mount.Options) t.Fatalf("no subvolid option in %v", mount.Options)
} }
} }