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

ApplyLayer() use RemoveAll to handle removing directories

Browse source 
rmTargetPath can be a directory, so we have to use RemoveAll() or we
will fail to whiteout non-empty directories.
This commit is contained in:
Alexander Larsson 2013-11-14 22:56:18 +01:00
parent eace2dbe1d
commit 006e2a600c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archive/diff.go
View file

@ -49,7 +49,7 @@ func ApplyLayer(dest string, layer Archive) error {
rmTargetPath := filepath.Join(filepath.Dir(fullPath), rmTargetName)
// Remove the file targeted by the whiteout
log.Printf("Removing whiteout target %s", rmTargetPath)
_ = os.Remove(rmTargetPath)
_ = os.RemoveAll(rmTargetPath)
// Remove the whiteout itself
log.Printf("Removing whiteout %s", fullPath)
_ = os.RemoveAll(fullPath)