Merge pull request #27510 from chipironcin/master

Improve error message
Upstream-commit: 5b16c4c8001fb6d047228ad27a9c39f2ac0e6f5b
Component: engine

components/engine/daemon/names.go

@@ -73,9 +73,9 @@ func (daemon *Daemon) reserveName(id, name string) (string, error) {
 				logrus.Errorf("got unexpected error while looking up reserved name: %v", err)
 				return "", err
 			}
-			return "", fmt.Errorf("Conflict. The container name %q is already in use by container %s. You have to remove (or rename) that container to be able to reuse that name.", name, id)
+			return "", fmt.Errorf("Conflict. The container name %q is already in use by container %q. You have to remove (or rename) that container to be able to reuse that name.", name, id)
 		}
-		return "", fmt.Errorf("error reserving name: %s, error: %v", name, err)
+		return "", fmt.Errorf("error reserving name: %q, error: %v", name, err)
 	}
 	return name, nil
 }