Merge pull request #6 from alexlarsson/fix-ApplyLayer-remove

archive.ApplyLayer() remove files recursively
crosbymichael · Nov 8, 2013 · 78ef0bd · 78ef0bd
2 parents c1563de + 484804a
commit 78ef0bd
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/archive/diff.go b/archive/diff.go
@@ -35,7 +35,7 @@ func ApplyLayer(dest string, layer Archive) error {
 			return err
 		} else if matched {
 			log.Printf("Removing aufs metadata %s", fullPath)
-			_ = os.Remove(fullPath)
+			_ = os.RemoveAll(fullPath)
 		}
 
 		filename := filepath.Base(path)
@@ -47,7 +47,7 @@ func ApplyLayer(dest string, layer Archive) error {
 			_ = os.Remove(rmTargetPath)
 			// Remove the whiteout itself
 			log.Printf("Removing whiteout %s", fullPath)
-			_ = os.Remove(fullPath)
+			_ = os.RemoveAll(fullPath)
 		}
 		return nil
 	})