summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2021-02-15 11:53:07 +0100
committerValentin Rothberg <rothberg@redhat.com>2021-02-16 12:49:02 +0100
commit39c1fdb155e9b46db009eba100b8083876adc4aa (patch)
treec0e18cbaee999ac182ba846c4f4f886d47a87841
parentdf8ba7f4a92750bfb173b5486a663d1735d70b2d (diff)
downloadpodman-39c1fdb155e9b46db009eba100b8083876adc4aa.tar.gz
podman-39c1fdb155e9b46db009eba100b8083876adc4aa.tar.bz2
podman-39c1fdb155e9b46db009eba100b8083876adc4aa.zip
correct startup error message
The error message when failing to create an image engine unconditionally pointed to the Podman socket which is quite confusing when running locally. Move the error message to the point where the first ping to the service fails. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
-rw-r--r--cmd/podman/root.go2
-rw-r--r--pkg/bindings/connection.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index 0ee530242..1f613a4c5 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -158,7 +158,7 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
// Prep the engines
if _, err := registry.NewImageEngine(cmd, args); err != nil {
- return errors.Wrapf(err, "Cannot connect to the Podman socket, make sure there is a Podman REST API service running.")
+ return err
}
if _, err := registry.NewContainerEngine(cmd, args); err != nil {
return err
diff --git a/pkg/bindings/connection.go b/pkg/bindings/connection.go
index 7b26037eb..6ff072e75 100644
--- a/pkg/bindings/connection.go
+++ b/pkg/bindings/connection.go
@@ -124,7 +124,7 @@ func NewConnectionWithIdentity(ctx context.Context, uri string, identity string)
ctx = context.WithValue(ctx, clientKey, &connection)
if err := pingNewConnection(ctx); err != nil {
- return nil, err
+ return nil, errors.Wrap(err, "cannot connect to the Podman socket, please verify that Podman REST API service is running")
}
return ctx, nil
}