Merge pull request #23862 from LK4D4/fix_unused

all: fix usage of some variables
This commit is contained in:
Aaron Lehmann 2016-06-23 10:21:10 -07:00 committed by GitHub
commit c9175a6deb
2 changed files with 2 additions and 3 deletions

View file

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

View file

@ -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.