diff options
| author | Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com> | 2023-08-04 18:22:53 +0530 |
|---|---|---|
| committer | Jake Hunsaker <jacob.r.hunsaker@gmail.com> | 2023-08-04 12:11:06 -0400 |
| commit | 2d3fc8f60389cab01b4b16a16a5824a85da1d1cf (patch) | |
| tree | ee90b0f56a2d6b919955dcfdc952c30d8d8ae7ee | |
| parent | 5caabe01086478c9f4fc175f02e2e2c7f89d080e (diff) | |
| download | sos-2d3fc8f60389cab01b4b16a16a5824a85da1d1cf.tar.gz | |
[plugins/ubuntu] Do not load tls module if not loaded
Adds a predicate to avoid loading the tls module if
it is not loaded.
Resolves: #3326
Signed-off-by: Nikhil Kshirsagar <nikhil.kshirsagar@canonical.com>
| -rw-r--r-- | sos/report/plugins/ubuntu.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sos/report/plugins/ubuntu.py b/sos/report/plugins/ubuntu.py index 9fc3c3a1..a6b1d6d3 100644 --- a/sos/report/plugins/ubuntu.py +++ b/sos/report/plugins/ubuntu.py @@ -6,7 +6,7 @@ # # See the LICENSE file in the source distribution for further information. -from sos.report.plugins import Plugin, UbuntuPlugin +from sos.report.plugins import Plugin, UbuntuPlugin, SoSPredicate from sos.utilities import is_executable @@ -30,8 +30,11 @@ class Ubuntu(Plugin, UbuntuPlugin): ua_tools_status = 'pro status' else: ua_tools_status = 'ubuntu-advantage status' - self.add_cmd_output(ua_tools_status) - self.add_cmd_output("%s --format json" % ua_tools_status) + ua_pred = SoSPredicate(self, kmods=['tls']) + self.add_cmd_output(ua_tools_status, + pred=ua_pred, changes=True) + self.add_cmd_output("%s --format json" % ua_tools_status, + pred=ua_pred, changes=True) if not self.get_option("all_logs"): self.add_copy_spec([ |