summaryrefslogtreecommitdiff
path: root/cmd/podman/main.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-02-12 15:45:54 +0100
committerGitHub <noreply@github.com>2019-02-12 15:45:54 +0100
commitbdf537f4fc983c30c945297d9ee33891a127f9bd (patch)
treeb6f813a58b904d06eed9bb8925a01904dce81de2 /cmd/podman/main.go
parentfaafdcf1f3509aeb83fd43729fa7c40ea360a3ea (diff)
parentccbc4fb006253788910eba86eb6674d3465992c3 (diff)
downloadpodman-bdf537f4fc983c30c945297d9ee33891a127f9bd.tar.gz
podman-bdf537f4fc983c30c945297d9ee33891a127f9bd.tar.bz2
podman-bdf537f4fc983c30c945297d9ee33891a127f9bd.zip
Merge pull request #2309 from rhatdan/help
Don't show global flags except for podman command
Diffstat (limited to 'cmd/podman/main.go')
-rw-r--r--cmd/podman/main.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 49acde1f9..3facc146c 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -58,7 +58,7 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
_killCommand: true,
_pauseCommand: true,
_restartCommand: true,
- _runCommmand: true,
+ _runCommand: true,
_unpauseCommand: true,
_searchCommand: true,
_statsCommand: true,
@@ -205,7 +205,7 @@ func main() {
exitCode = status.ExitStatus()
}
}
- fmt.Fprintln(os.Stderr, err.Error())
+ fmt.Fprintln(os.Stderr, "Error:", err.Error())
}
} else {
// The exitCode modified from 125, indicates an application