all: fix usage of some variables

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 57e14714ee85e67f59d8c22aed23dc875cf2e58c
Component: engine

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
 		}
 	}
 

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.