From eb493ee13be73b58a256bea05f05d31bb9e4b395 Mon Sep 17 00:00:00 2001
From: Victor Vieux <victor.vieux@dotcloud.com>
Date: Tue, 13 Aug 2013 13:35:34 +0000
Subject: [PATCH] fix merge issue Upstream-commit:
 6cb908bb823409661bfedab806da924d232bf200 Component: engine

---
 components/engine/commands.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/engine/commands.go b/components/engine/commands.go
index 9b9dd51e75..d9d4f1b620 100644
--- a/components/engine/commands.go
+++ b/components/engine/commands.go
@@ -857,7 +857,7 @@ func (cli *DockerCli) CmdPush(args ...string) error {
 	}
 
 	if err := push(); err != nil {
-		if err == fmt.Errorf("Authentication is required.") {
+		if err.Error() == "Authentication is required." {
 			if err = cli.checkIfLogged("push"); err == nil {
 				return push()
 			}