Browse Source

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

archive.ApplyLayer() remove files recursively
Solomon Hykes 11 years ago
parent
commit
78ef0bd998
1 changed files with 2 additions and 2 deletions
  1. 2 2
      archive/diff.go

+ 2 - 2
archive/diff.go

@@ -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
 	})
 	})