opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-25 02:04:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16581 from mtrmac/modified-test

Browse Source 
Update c/storage after https://github.com/containers/storage/pull/1436
This commit is contained in:
OpenShift Merge Robot
2022-12-05 13:16:57 -05:00
committed by GitHub
parent 41af424cd8 c83efd0f07
commit c942f77887
23 changed files with 531 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/rootless/rootless.go
View File

@ -29,7 +29,7 @@ func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
}
// It could not join the pause process, let's lock the file before trying to delete it.
pidFileLock, err := lockfile.GetLockfile(pausePidPath)
pidFileLock, err := lockfile.GetLockFile(pausePidPath)
if err != nil {
// The file was deleted by another process.
if os.IsNotExist(err) {