0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

archive.ApplyLayer() - handle directory whiteouts

Browse source 
When directories are white-outed we can get called with the previously
removed directories. Handle this with os.IsNotExist(error).
This commit is contained in:
Alexander Larsson 2013-11-11 17:39:19 +01:00
parent 948bb29d27
commit 6f3c32eb18
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
archive/diff.go
View file

@ -20,6 +20,11 @@ func ApplyLayer(dest string, layer Archive) error {
// Step 2: walk for whiteouts and apply them, removing them in the process // Step 2: walk for whiteouts and apply them, removing them in the process
err := filepath.Walk(dest, func(fullPath string, f os.FileInfo, err error) error { err := filepath.Walk(dest, func(fullPath string, f os.FileInfo, err error) error {
if err != nil { if err != nil {
if os.IsNotExist(err) {
// This happens in the case of whiteouts in parent dir removing a directory
// We just ignore it
return filepath.SkipDir
}
return err return err
} }