89b86368f8
Update sos in rawhide to the upstream 3.2 release and additional patches including the fix for CVE-2015-7529.
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
From f9aefde0d7f74867031a00b52f72d0ad1ff9463b Mon Sep 17 00:00:00 2001
|
|
From: "Bryn M. Reeves" <bmr@redhat.com>
|
|
Date: Wed, 15 Oct 2014 15:51:13 +0100
|
|
Subject: [PATCH] [ovirt_hosted_engine] fix exception when force-enabled
|
|
|
|
Fixes #416.
|
|
|
|
Signed-off-by: Bryn M. Reeves <bmr@redhat.com>
|
|
---
|
|
sos/plugins/ovirt_hosted_engine.py | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/sos/plugins/ovirt_hosted_engine.py b/sos/plugins/ovirt_hosted_engine.py
|
|
index aee8bc0..02cb2b6 100644
|
|
--- a/sos/plugins/ovirt_hosted_engine.py
|
|
+++ b/sos/plugins/ovirt_hosted_engine.py
|
|
@@ -56,8 +56,9 @@ class OvirtHostedEngine(Plugin, RedHatPlugin):
|
|
|
|
all_setup_logs = glob.glob(self.SETUP_LOG_GLOB)
|
|
all_setup_logs.sort(reverse=True)
|
|
- # Add latest ovirt-hosted-engine-setup log file
|
|
- self.add_copy_spec(all_setup_logs[0])
|
|
+ if len(all_setup_logs):
|
|
+ # Add latest ovirt-hosted-engine-setup log file
|
|
+ self.add_copy_spec(all_setup_logs[0])
|
|
# Add older ovirt-hosted-engine-setup log files only if requested
|
|
if self.get_option('all_logs'):
|
|
self.add_copy_spec_limit(
|
|
--
|
|
1.9.3
|
|
|