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

Merge pull request #95 from dotcloud/93-test_restore_fail-fix

Browse Source 
Make sure that Deregister really returns an error instead of just displaying it
Upstream-commit: 29210802dd9639c6ce2bf1e1d4d7cf9b1b50b4cd
Component: engine
This commit is contained in:
Guillaume J. Charmes
2013-03-15 03:10:27 -07:00
parent 15232d04ae 8a09295f01
commit 86d34fa83c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/docker.go
View File

@ -74,14 +74,14 @@ func (docker *Docker) Destroy(container *Container) error {
}
if container.Mountpoint.Mounted() {
if err := container.Mountpoint.Umount(); err != nil {
log.Printf("Unable to umount container %v: %v", container.Id, err)
return fmt.Errorf("Unable to umount container %v: %v", container.Id, err)
}
}
if err := container.Mountpoint.Deregister(); err != nil {
log.Printf("Unable to deregiser mountpoint %v: %v", container.Mountpoint.Root, err)
return fmt.Errorf("Unable to deregiser -- ? mountpoint %v: %v", container.Mountpoint.Root, err)
}
if err := os.RemoveAll(container.Root); err != nil {
log.Printf("Unable to remove filesystem for %v: %v", container.Id, err)
return fmt.Errorf("Unable to remove filesystem for %v: %v", container.Id, err)
}
docker.containers.Remove(element)
return nil