From 926d66b50fa628e37ba500c623ec359f4f5d3ce8 Mon Sep 17 00:00:00 2001 From: Alexander Morozov Date: Wed, 22 Jun 2016 10:40:32 -0700 Subject: [PATCH] all: fix usage of some variables Signed-off-by: Alexander Morozov (cherry picked from commit 57e14714ee85e67f59d8c22aed23dc875cf2e58c) Signed-off-by: Tibor Vass --- libcontainerd/client_windows.go | 3 +-- plugin/backend.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libcontainerd/client_windows.go b/libcontainerd/client_windows.go index 6df959b6d8..7a43237b06 100644 --- a/libcontainerd/client_windows.go +++ b/libcontainerd/client_windows.go @@ -296,9 +296,8 @@ func (clnt *client) Signal(containerID string, sig int) error { } else { // Terminate Process if err := cont.hcsProcess.Kill(); err != nil { + // ignore errors logrus.Warnf("Failed to terminate pid %d in %s: %q", cont.systemPid, containerID, err) - // Ignore errors - err = nil } } diff --git a/plugin/backend.go b/plugin/backend.go index f90a1d11d6..ada623950b 100644 --- a/plugin/backend.go +++ b/plugin/backend.go @@ -118,7 +118,7 @@ func (pm *Manager) Push(name string, metaHeader http.Header, authConfig *types.A _, err = distribution.Push(name, pm.registryService, metaHeader, authConfig, config, rootfs) // XXX: Ignore returning digest for now. // Since digest needs to be written to the ProgressWriter. - return nil + return err } // Remove deletes plugin's root directory.