diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-09-07 14:50:23 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-09-07 14:50:23 +0200 |
| commit | 8d40bf3f14c67122a138a687751f903611f24d59 (patch) | |
| tree | ca7b94705b4ccee7a1c58b65791d6a8a31346ba5 | |
| parent | 7946628734ba7cf866fcc8445b00f7dd8d9b245c (diff) | |
| download | podman-8d40bf3f14c67122a138a687751f903611f24d59.tar.gz podman-8d40bf3f14c67122a138a687751f903611f24d59.tar.bz2 podman-8d40bf3f14c67122a138a687751f903611f24d59.zip | |
proper --debug/-D flag support
--debug should not be a global flag, you can only use this as podman
--debug never podman ps --debug. This matches docker and allows us to
add the shorthand "D" since they now no longer conflict.
Fixes changes from commit 2d30b4dee596 which claims to add -D but never
did.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| -rw-r--r-- | cmd/podman/root.go | 4 | ||||
| -rw-r--r-- | test/system/001-basic.bats | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cmd/podman/root.go b/cmd/podman/root.go index f45dc94b2..0261cd670 100644 --- a/cmd/podman/root.go +++ b/cmd/podman/root.go @@ -475,8 +475,8 @@ func rootFlags(cmd *cobra.Command, opts *entities.PodmanConfig) { pFlags.StringVar(&logLevel, logLevelFlagName, logLevel, fmt.Sprintf("Log messages above specified level (%s)", strings.Join(common.LogLevels, ", "))) _ = rootCmd.RegisterFlagCompletionFunc(logLevelFlagName, common.AutocompleteLogLevel) - pFlags.BoolVar(&debug, "debug", false, "Docker compatibility, force setting of log-level") - _ = pFlags.MarkHidden("debug") + lFlags.BoolVarP(&debug, "debug", "D", false, "Docker compatibility, force setting of log-level") + _ = lFlags.MarkHidden("debug") // Only create these flags for ABI connections if !registry.IsRemote() { diff --git a/test/system/001-basic.bats b/test/system/001-basic.bats index 584511388..1148aaae7 100644 --- a/test/system/001-basic.bats +++ b/test/system/001-basic.bats @@ -190,7 +190,9 @@ See 'podman version --help'" "podman version --remote" run_podman --log-level=error info run_podman --log-level=fatal info run_podman --log-level=panic info + # docker compat run_podman --debug info + run_podman -D info run_podman 1 --debug --log-level=panic info is "$output" "Setting --log-level and --debug is not allowed" } |