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

make various changes to ps output

Browse Source 
for backwards compatibility and auto-test, we needed a few changes
that slipped in when i reworked ps to be faster to be reverted. the
follow behaviours were reverted:

1. the is_infra column was redacted.  that appears to be a mistake on my
part.
2. a newline after ps prints its format was added
3. a newline prior to printing the headers was removed.

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude
2018-10-29 14:33:32 -05:00
parent aef9d56ae2
commit 058f0e3681
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/podman/ps.go
View File

@ -334,11 +334,7 @@ func psCmd(c *cli.Context) error {
// Output standard PS headers
if !opts.Namespace {
fmt.Fprintf(w, "\n%s\t%s\t%s\t%s\t%s\t%s\t%s", hid, himage, hcommand, hcreated, hstatus, hports, hnames)
// If the user does not want size OR pod info, we print the isInfra bool
if !opts.Size && !opts.Pod {
fmt.Fprintf(w, "\t%s", hinfra)
}
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\t%s", hid, himage, hcommand, hcreated, hstatus, hports, hnames)
// User wants pod info
if opts.Pod {
fmt.Fprintf(w, "\t%s", hpod)
@ -349,22 +345,15 @@ func psCmd(c *cli.Context) error {
}
} else {
// Output Namespace headers
fmt.Fprintf(w, "\n%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s", hid, hnames, nspid, nscgroup, nsipc, nsmnt, nsnet, nspidns, nsuserns, nsuts)
}
if len(pss) == 0 {
fmt.Fprint(w, "\n")
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s", hid, hnames, nspid, nscgroup, nsipc, nsmnt, nsnet, nspidns, nsuserns, nsuts)
}
// Now iterate each container and output its information
for _, container := range pss {
// Standard PS output
if !opts.Namespace {
fmt.Fprintf(w, "\n%s\t%s\t%s\t%s\t%s\t%s\t%s", container.ID, container.Image, container.Command, container.Created, container.Status, container.Ports, container.Names)
// If not size and not pod info, do isInfra
if !opts.Size && !opts.Pod {
fmt.Fprintf(w, "\t%t", container.IsInfra)
}
// User wants pod info
if opts.Pod {
fmt.Fprintf(w, "\t%s", container.Pod)
@ -387,6 +376,7 @@ func psCmd(c *cli.Context) error {
}
}
fmt.Fprint(w, "\n")
return nil
}