Browse code

all: fix usage of some variables

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Alexander Morozov authored on 2016/06/23 02:40:32
Showing 2 changed files
... ...
@@ -295,9 +295,8 @@ func (clnt *client) Signal(containerID string, sig int) error {
295 295
 	} else {
296 296
 		// Terminate Process
297 297
 		if err := cont.hcsProcess.Kill(); err != nil {
298
+			// ignore errors
298 299
 			logrus.Warnf("Failed to terminate pid %d in %s: %q", cont.systemPid, containerID, err)
299
-			// Ignore errors
300
-			err = nil
301 300
 		}
302 301
 	}
303 302
 
... ...
@@ -113,7 +113,7 @@ func (pm *Manager) Push(name string, metaHeader http.Header, authConfig *types.A
113 113
 	_, err = distribution.Push(name, pm.registryService, metaHeader, authConfig, config, rootfs)
114 114
 	// XXX: Ignore returning digest for now.
115 115
 	// Since digest needs to be written to the ProgressWriter.
116
-	return nil
116
+	return err
117 117
 }
118 118
 
119 119
 // Remove deletes plugin's root directory.