InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18907 from mountkin/rm

Browse Source 
ingnore the NotExist error when removing inexistent files
This commit is contained in:
Arnaud Porterie
2015-12-26 19:20:10 -08:00
parent 087e4c1024 de7f6cf16b
commit 603d488a00
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/graphdriver/btrfs/btrfs.go
View File

@@ -278,7 +278,10 @@ func (d *Driver) Remove(id string) error {
if err := subvolDelete(d.subvolumesDir(), id); err != nil {
return err
}
return os.RemoveAll(dir)
if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) {
return err
}
return nil
}
// Get the requested filesystem id.

5
daemon/graphdriver/overlay/overlay.go
View File

@@ -322,7 +322,10 @@ func (d *Driver) dir(id string) string {
// Remove cleans the directories that are created for this id.
func (d *Driver) Remove(id string) error {
return os.RemoveAll(d.dir(id))
if err := os.RemoveAll(d.dir(id)); err != nil && !os.IsNotExist(err) {
return err
}
return nil
}
// Get creates and mounts the required file system for the given id and returns the mount path.

4
daemon/graphdriver/vfs/driver.go
View File

@@ -104,10 +104,10 @@ func (d *Driver) dir(id string) string {
// Remove deletes the content from the directory for a given id.
func (d *Driver) Remove(id string) error {
if _, err := os.Stat(d.dir(id)); err != nil {
if err := os.RemoveAll(d.dir(id)); err != nil && !os.IsNotExist(err) {
return err
}
return os.RemoveAll(d.dir(id))
return nil
}
// Get returns the directory for the given id.