Merge pull request #470 from vieux/pull_errors

handle errors in pull
2015-03-11 16:31:59 -07:00 · 2015-03-11 16:31:59 -07:00 · 5ded70bb70
parent 721c3b07ab de62579f8d
commit 5ded70bb70
1 changed files with 6 additions and 2 deletions
--- a/cluster/swarm/cluster.go
+++ b/cluster/swarm/cluster.go
@ -194,9 +194,13 @@ func (c *Cluster) Pull(name string, callback func(what, status string)) {
 			if callback != nil {
 				callback(nn.Name(), "")
 			}
-			nn.pull(name)
+			err := nn.pull(name)
 			if callback != nil {
-				callback(nn.Name(), "downloaded")
+				if err != nil {
+					callback(nn.Name(), err.Error())
+				} else {
+					callback(nn.Name(), "downloaded")
+				}
 			}
 			done <- true
 		}(n)