Browse code
all: fix usage of some variables
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
(cherry picked from commit 57e14714ee85e67f59d8c22aed23dc875cf2e58c)
Signed-off-by: Tibor Vass <tibor@docker.com>
Alexander Morozov authored on 2016/06/23 02:40:32Showing 2 changed files
| ... | ... |
@@ -296,9 +296,8 @@ func (clnt *client) Signal(containerID string, sig int) error {
|
| 296 | 296 |
} else {
|
| 297 | 297 |
// Terminate Process |
| 298 | 298 |
if err := cont.hcsProcess.Kill(); err != nil {
|
| 299 |
+ // ignore errors |
|
| 299 | 300 |
logrus.Warnf("Failed to terminate pid %d in %s: %q", cont.systemPid, containerID, err)
|
| 300 |
- // Ignore errors |
|
| 301 |
- err = nil |
|
| 302 | 301 |
} |
| 303 | 302 |
} |
| 304 | 303 |
|
| ... | ... |
@@ -118,7 +118,7 @@ func (pm *Manager) Push(name string, metaHeader http.Header, authConfig *types.A |
| 118 | 118 |
_, err = distribution.Push(name, pm.registryService, metaHeader, authConfig, config, rootfs) |
| 119 | 119 |
// XXX: Ignore returning digest for now. |
| 120 | 120 |
// Since digest needs to be written to the ProgressWriter. |
| 121 |
- return nil |
|
| 121 |
+ return err |
|
| 122 | 122 |
} |
| 123 | 123 |
|
| 124 | 124 |
// Remove deletes plugin's root directory. |