Parcourir la source

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

Make sure that Deregister really returns an error instead of just displaying it
Guillaume J. Charmes il y a 12 ans
Parent
commit
29210802dd
1 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 3 3
      docker.go

+ 3 - 3
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