opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tolerate non-running containers in paused cp

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-05-29 16:35:16 -04:00
parent 431e633b48
commit 79990b7364
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/podman/cp.go
View File

@ -97,14 +97,23 @@ func copyBetweenHostAndContainer(runtime *libpod.Runtime, src string, dest strin
if pause { if pause {
if err := ctr.Pause(); err != nil { if err := ctr.Pause(); err != nil {
// An invalid state error is fine.
// The container isn't running or is already paused.
// TODO: We can potentially start the container while
// the copy is running, which still allows a race where
// malicious code could mess with the symlink.
if errors.Cause(err) != libpod.ErrCtrStateInvalid {
return err return err
} }
} else if err == nil {
// Only add the defer if we actually paused
defer func() { defer func() {
if err := ctr.Unpause(); err != nil { if err := ctr.Unpause(); err != nil {
logrus.Errorf("Error unpausing container after copying: %v", err) logrus.Errorf("Error unpausing container after copying: %v", err)
} }
}() }()
} }
}
user, err := getUser(mountPoint, ctr.User()) user, err := getUser(mountPoint, ctr.User())
if err != nil { if err != nil {