kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17 from alexlarsson/dm-plugin-whiteout-directory

Browse source 
archive.ApplyLayer() - handle directory whiteouts
This commit is contained in:
Guillaume J. Charmes 2013-11-12 12:16:30 -08:00
commit 50d80a8938
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
} }