p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #34983 from thaJeztah/suppress-tmp-rename-warning

Browse Source 
Suppress warning for renaming missing tmp directory
Upstream-commit: 65234597216d03866bc26bdad06cb1f25f832206
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-09-26 16:53:28 +02:00
committed by GitHub
parent b4098a4e18 cbf8cc6faf
commit 671d46ed3d
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/daemon.go
View File

@ -1044,7 +1044,7 @@ func prepareTempDir(rootDir string, rootIDs idtools.IDPair) (string, error) {
logrus.Warnf("failed to delete old tmp directory: %s", newName)
}
}()
} else {
} else if !os.IsNotExist(err) {
logrus.Warnf("failed to rename %s for background deletion: %s. Deleting synchronously", tmpDir, err)
if err := os.RemoveAll(tmpDir); err != nil {
logrus.Warnf("failed to delete old tmp directory: %s", tmpDir)