diff options
| author | Pavel Moravec <pmoravec@redhat.com> | 2023-11-30 16:23:06 +0100 |
|---|---|---|
| committer | Jake Hunsaker <jacob.r.hunsaker@gmail.com> | 2023-12-02 11:45:15 -0500 |
| commit | d53bffed58ab94617026df763f623e7b4780e997 (patch) | |
| tree | 471c76136c754459145ab338f800549ffa413c60 | |
| parent | 041da6421c4be84e64c14e045ddd236eaf62e215 (diff) | |
| download | sos-d53bffed58ab94617026df763f623e7b4780e997.tar.gz | |
[report] Clean tmpdir when adding or deleting preset
When adding or deleting preset (and also when detecting no plugin leaves
enabled), sos.report.execute must cleanup its working dir.
Since we don't use return value of the execute method, we can skip the
return command.
Resolves: #3430
Closes: #3431
Signed-off-by: Pavel Moravec <pmoravec@redhat.com>
| -rw-r--r-- | sos/report/__init__.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sos/report/__init__.py b/sos/report/__init__.py index 40012cd8..d4ec9922 100644 --- a/sos/report/__init__.py +++ b/sos/report/__init__.py @@ -1809,12 +1809,14 @@ class SoSReport(SoSComponent): self.list_presets() raise SystemExit if self.opts.add_preset: - return self.add_preset(self.opts.add_preset) + self.add_preset(self.opts.add_preset) + raise SystemExit if self.opts.del_preset: - return self.del_preset(self.opts.del_preset) + self.del_preset(self.opts.del_preset) + raise SystemExit # verify that at least one plug-in is enabled if not self.verify_plugins(): - return False + raise SystemExit self.batch() self.prework() |