summaryrefslogtreecommitdiff
path: root/cmd/podman/root.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-16 08:41:26 -0500
committerGitHub <noreply@github.com>2021-02-16 08:41:26 -0500
commit271c5612e898f6fea68b687fdfeccf2ecc0c0b46 (patch)
tree72f12a6a99fa7cc428ef5ce3fba1b35d25f3071b /cmd/podman/root.go
parent7b17c77adc63c3dc062208189942543027f1495d (diff)
parent39c1fdb155e9b46db009eba100b8083876adc4aa (diff)
downloadpodman-271c5612e898f6fea68b687fdfeccf2ecc0c0b46.tar.gz
podman-271c5612e898f6fea68b687fdfeccf2ecc0c0b46.tar.bz2
podman-271c5612e898f6fea68b687fdfeccf2ecc0c0b46.zip
Merge pull request #9369 from vrothberg/startup-errors
correct startup error message
Diffstat (limited to 'cmd/podman/root.go')
-rw-r--r--cmd/podman/root.go2
1 files changed, 1 insertions, 1 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