p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ingnore the NotExist error when removing inexistent files

Browse Source 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: de7f6cf16be659cca9217ece6e5dc1221706d504
Component: engine
This commit is contained in:
Shijiang Wei
2015-12-25 15:04:34 +08:00
parent 91a83f8dd4
commit 3ad8eda6ea
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/engine/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
components/engine/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
components/engine/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.