From 54b44e3705046a27402536ce9f9ab70d71cd403d Mon Sep 17 00:00:00 2001 From: creack Date: Fri, 15 Mar 2013 03:07:33 -0700 Subject: [PATCH] Make sure that Deregister really returns an error instead of just displaying it --- docker.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker.go b/docker.go index 7a1c6a00f7..626c7452ea 100644 --- a/docker.go +++ b/docker.go @@ -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