Merge pull request #23258 from allencloud/return-err-when-volume-list-fails

return err when volume list fails Upstream-commit: 506e8eda40d4c0efdb9b474fc71c01cabf08e404 Component: engine
2016-06-05 13:24:25 -04:00
parent 5598c44830 b8e65d7c23
commit 0978ffe8f4
1 changed files with 4 additions and 0 deletions
--- a/components/engine/daemon/list.go
+++ b/components/engine/daemon/list.go
@ -499,6 +499,10 @@ func (daemon *Daemon) Volumes(filter string) ([]*types.Volume, []string, error)
 	}

 	volumes, warnings, err := daemon.volumes.List()
+	if err != nil {
+		return nil, nil, err
+	}
+
 	filterVolumes, err := daemon.filterVolumes(volumes, volFilters)
 	if err != nil {
 		return nil, nil, err