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

archive.ApplyLayer() remove files recursively

Browse source 
Some aufs metadata are directories, and whiteouts can be for
directories, so use os.RemoveAll() for these.
This commit is contained in:
Alexander Larsson 2013-11-07 22:46:44 +01:00
parent 140da580d4
commit 484804abff
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
archive/diff.go
View file

@ -35,7 +35,7 @@ func ApplyLayer(dest string, layer Archive) error {
return err return err
} else if matched { } else if matched {
log.Printf("Removing aufs metadata %s", fullPath) log.Printf("Removing aufs metadata %s", fullPath)
_ = os.Remove(fullPath) _ = os.RemoveAll(fullPath)
} }
filename := filepath.Base(path) filename := filepath.Base(path)
@ -47,7 +47,7 @@ func ApplyLayer(dest string, layer Archive) error {
_ = os.Remove(rmTargetPath) _ = os.Remove(rmTargetPath)
// Remove the whiteout itself // Remove the whiteout itself
log.Printf("Removing whiteout %s", fullPath) log.Printf("Removing whiteout %s", fullPath)
_ = os.Remove(fullPath) _ = os.RemoveAll(fullPath)
} }
return nil return nil
}) })