diff options
| author | Jake Hunsaker <jhunsake@redhat.com> | 2019-02-28 00:51:47 -0500 |
|---|---|---|
| committer | Bryn M. Reeves <bmr@redhat.com> | 2019-03-21 12:29:53 +0000 |
| commit | e122aef1b0efc659247d6e21a277650ff5664fcf (patch) | |
| tree | b7e56caf857f35f7445d02a89449a5aac7b4cab1 | |
| parent | ad02774656fbe04cb8ddbb25bdfb68fbe2aa19d8 (diff) | |
| download | sos-e122aef1b0efc659247d6e21a277650ff5664fcf.tar.gz | |
[buildah] Collect --all separately for containers and images
Adds a separate collections of --all for both the containers and images
lists.
Also, small fix to rename a variable to avoid using the same variable
name twice.
Resolves: #1582
Signed-off-by: Jake Hunsaker <jhunsake@redhat.com>
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
| -rw-r--r-- | sos/plugins/buildah.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sos/plugins/buildah.py b/sos/plugins/buildah.py index 61a7417b..c6c57553 100644 --- a/sos/plugins/buildah.py +++ b/sos/plugins/buildah.py @@ -27,11 +27,15 @@ class Buildah(Plugin, RedHatPlugin): "/etc/containers/policy.json", ]) - self.add_cmd_output([ - 'buildah containers', - 'buildah images', - 'buildah version' - ]) + subcmds = [ + 'containers', + 'containers --all', + 'images', + 'images --all', + 'version' + ] + + self.add_cmd_output(["buildah %s" % sub for sub in subcmds]) def make_chowdah(aurdah): chowdah = self.get_command_output(aurdah) @@ -43,8 +47,8 @@ class Buildah(Plugin, RedHatPlugin): if containahs['is_wicked_pissah']: for containah in containahs['auutput'].splitlines(): # obligatory Tom Brady - brady = containah.split()[4] - self.add_cmd_output('buildah inspect -t container %s' % brady) + goat = containah.split()[4] + self.add_cmd_output('buildah inspect -t container %s' % goat) pitchez = make_chowdah('buildah images -n') if pitchez['is_wicked_pissah']: |