From 9e92fb5474fd745e0e05ffeb1f2249f1149cd2aa 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 Upstream-commit: 57e14714ee85e67f59d8c22aed23dc875cf2e58c Component: engine --- components/engine/libcontainerd/client_windows.go | 3 +-- components/engine/plugin/backend.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/components/engine/libcontainerd/client_windows.go b/components/engine/libcontainerd/client_windows.go index 78b3b992f1..484f465228 100644 --- a/components/engine/libcontainerd/client_windows.go +++ b/components/engine/libcontainerd/client_windows.go @@ -295,9 +295,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/components/engine/plugin/backend.go b/components/engine/plugin/backend.go index 1b6daa4770..8dcca58cb3 100644 --- a/components/engine/plugin/backend.go +++ b/components/engine/plugin/backend.go @@ -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) // 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.