Merge pull request #2487 from thaJeztah/fix_compilation_issues_on_go1.11

estesp · web-flow · commit 88ec4559b611 · 2018-07-23T14:52:27.000-04:00
Fix compilation failures on Go 1.11
diff --git a/windows/process.go b/windows/process.go
@@ -121,7 +121,7 @@ func (p *process) HcsPid() uint32 {
 
 func (p *process) ExitCode() (uint32, time.Time, error) {
 	if s := p.Status(); s != runtime.StoppedStatus && s != runtime.CreatedStatus {
-		return 255, time.Time{}, errors.Wrapf(errdefs.ErrFailedPrecondition, "process is not stopped: %s", s)
+		return 255, time.Time{}, errors.Wrapf(errdefs.ErrFailedPrecondition, "process is not stopped: %d", s)
 	}
 	return p.exitCode, p.exitTime, nil
 }
diff --git a/windows/task.go b/windows/task.go
@@ -284,7 +284,7 @@ func (t *task) Update(ctx context.Context, resources *types.Any) error {
 func (t *task) Process(ctx context.Context, id string) (p runtime.Process, err error) {
 	p = t.getProcess(id)
 	if p == nil {
-		err = errors.Wrapf(errdefs.ErrNotFound, "no such process %d", id)
+		err = errors.Wrapf(errdefs.ErrNotFound, "no such process %s", id)
 	}
 
 	return p, err
@@ -297,7 +297,7 @@ func (t *task) Stats(ctx context.Context) (*types.Any, error) {
 func (t *task) Wait(ctx context.Context) (*runtime.Exit, error) {
 	p := t.getProcess(t.id)
 	if p == nil {
-		return nil, errors.Wrapf(errdefs.ErrNotFound, "no such process %d", t.id)
+		return nil, errors.Wrapf(errdefs.ErrNotFound, "no such process %s", t.id)
 	}
 	return p.Wait(ctx)
 }

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ func (p *process) HcsPid() uint32 {`
`121`	`121`
`122`	`122`	`func (p *process) ExitCode() (uint32, time.Time, error) {`
`123`	`123`	`if s := p.Status(); s != runtime.StoppedStatus && s != runtime.CreatedStatus {`
`124`		`- return 255, time.Time{}, errors.Wrapf(errdefs.ErrFailedPrecondition, "process is not stopped: %s", s)`
	`124`	`+ return 255, time.Time{}, errors.Wrapf(errdefs.ErrFailedPrecondition, "process is not stopped: %d", s)`
`125`	`125`	`}`
`126`	`126`	`return p.exitCode, p.exitTime, nil`
`127`	`127`	`}`
Original file line number	Diff line number	Diff line change
`@@ -284,7 +284,7 @@ func (t task) Update(ctx context.Context, resources types.Any) error {`
`284`	`284`	`func (t *task) Process(ctx context.Context, id string) (p runtime.Process, err error) {`
`285`	`285`	`p = t.getProcess(id)`
`286`	`286`	`if p == nil {`
`287`		`- err = errors.Wrapf(errdefs.ErrNotFound, "no such process %d", id)`
	`287`	`+ err = errors.Wrapf(errdefs.ErrNotFound, "no such process %s", id)`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`return p, err`
`@@ -297,7 +297,7 @@ func (t task) Stats(ctx context.Context) (types.Any, error) {`
`297`	`297`	`func (t task) Wait(ctx context.Context) (runtime.Exit, error) {`
`298`	`298`	`p := t.getProcess(t.id)`
`299`	`299`	`if p == nil {`
`300`		`- return nil, errors.Wrapf(errdefs.ErrNotFound, "no such process %d", t.id)`
	`300`	`+ return nil, errors.Wrapf(errdefs.ErrNotFound, "no such process %s", t.id)`
`301`	`301`	`}`
`302`	`302`	`return p.Wait(ctx)`
`303`	`303`	`}`