0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

all: fix usage of some variables

Browse source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
This commit is contained in:
Alexander Morozov 2016-06-22 10:40:32 -07:00
parent 7b2b4eb40c
commit 57e14714ee
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libcontainerd/client_windows.go
View file

@ -295,9 +295,8 @@ func (clnt *client) Signal(containerID string, sig int) error {
} else { } else {
// Terminate Process // Terminate Process
if err := cont.hcsProcess.Kill(); err != nil { if err := cont.hcsProcess.Kill(); err != nil {
// ignore errors
logrus.Warnf("Failed to terminate pid %d in %s: %q", cont.systemPid, containerID, err) logrus.Warnf("Failed to terminate pid %d in %s: %q", cont.systemPid, containerID, err)
// Ignore errors
err = nil
} }
} }

2
plugin/backend.go
View file

@ -113,7 +113,7 @@ func (pm *Manager) Push(name string, metaHeader http.Header, authConfig *types.A
_, err = distribution.Push(name, pm.registryService, metaHeader, authConfig, config, rootfs) _, err = distribution.Push(name, pm.registryService, metaHeader, authConfig, config, rootfs)
// XXX: Ignore returning digest for now. // XXX: Ignore returning digest for now.
// Since digest needs to be written to the ProgressWriter. // Since digest needs to be written to the ProgressWriter.
return nil return err
} }
// Remove deletes plugin's root directory. // Remove deletes plugin's root directory.