From a9463439417c77d9bb6914f4c9ae9349dcada645 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Wed, 11 Sep 2024 10:11:01 +0200 Subject: [PATCH] [leapp] improve plugin enablement and add more collected files The `leapp-repository` package was renamed to `leapp-upgrade-elXtoY` in [1], and while we could list all possible combinations here, the main `leapp` package should be enough to trigger this plugin While at it, also enable plugin when /var/lib/leapp exists, as after an upgrade is performed, users often uninstall the leapp packages, but it can still be beneficial for SOS to collect data about the fact that this is a system that was upgraded (and data about the upgrade) and /var/lib/leapp shows exactly that. Also include /etc/migration-results and /var/log/leapp/answerfile in collected files. [1] https://github.com/oamg/leapp-repository/commit/924c398a003f8ada079f2819fa3305adda7dfcda Signed-off-by: Evgeni Golov --- sos/report/plugins/leapp.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sos/report/plugins/leapp.py b/sos/report/plugins/leapp.py index fd64a11537..379908ec81 100644 --- a/sos/report/plugins/leapp.py +++ b/sos/report/plugins/leapp.py @@ -16,10 +16,13 @@ class Leapp(Plugin, RedHatPlugin): short_desc = 'Leapp upgrade handling tool' plugin_name = 'leapp' - packages = ('leapp', 'leapp-repository') + packages = ('leapp',) + files = ('/var/lib/leapp',) def setup(self): self.add_copy_spec([ + '/etc/migration-results', + '/var/log/leapp/answerfile', '/var/log/leapp/dnf-debugdata/', '/var/log/leapp/leapp-preupgrade.log', '/var/log/leapp/leapp-upgrade.log',