opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-15 02:06:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

correct startup error message

Browse Source 
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>
This commit is contained in:
Valentin Rothberg
2021-02-15 11:53:07 +01:00
parent df8ba7f4a9
commit 39c1fdb155
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/root.go
View File

@ -158,7 +158,7 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
// Prep the engines // Prep the engines
if _, err := registry.NewImageEngine(cmd, args); err != nil { 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 { if _, err := registry.NewContainerEngine(cmd, args); err != nil {
return err return err

2
pkg/bindings/connection.go
View File

@ -124,7 +124,7 @@ func NewConnectionWithIdentity(ctx context.Context, uri string, identity string)
ctx = context.WithValue(ctx, clientKey, &connection) ctx = context.WithValue(ctx, clientKey, &connection)
if err := pingNewConnection(ctx); err != nil { 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 return ctx, nil
} }