containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9369 from vrothberg/startup-errors 

correct startup error message
This commit is contained in:
OpenShift Merge Robot 2021-02-16 08:41:26 -05:00 committed by GitHub
parent 7b17c77adc 39c1fdb155
commit 271c5612e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats 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
} }