7966fde1ef
- Update to 2018.3.2 See https://docs.saltstack.com/en/latest/topics/releases/2018.3.2.html for full changelog - Added: * accounting-for-when-files-in-an-archive-contain-non-.patch * add-all_versions-parameter-to-include-all-installed-.patch * add-custom-suse-capabilities-as-grains.patch * add-engine-relaying-libvirt-events.patch * add-environment-variable-to-know-if-yum-is-invoked-f.patch * add-other-attribute-to-gecos-fields-to-avoid-inconsi.patch * align-suse-salt-master.service-limitnofiles-limit-wi.patch * avoid-incomprehensive-message-if-crashes.patch * fix-deprecation-warning-bsc-1095507.patch * fix-diffing-binary-files-in-file.get_diff-bsc-109839.patch * fix-unboundlocalerror-in-file.get_diff.patch * fix-zypper.list_pkgs-to-be-aligned-with-pkg-state.patch * prevent-zypper-from-parsing-repo-configuration-from-.patch * remove-old-hack-when-reporting-multiversion-packages.patch * show-recommendations-for-salt-ssh-cross-version-pyth.patch - Modified: * activate-all-beacons-sources-config-pillar-grains.patch * add-saltssh-multi-version-support-across-python-inte.patch * avoid-excessive-syslogging-by-watchdog-cronjob-58.patch * do-not-override-jid-on-returners-only-sending-back-t.patch * enable-passing-a-unix_socket-for-mysql-returners-bsc.patch * fall-back-to-pymysql.patch * feat-add-grain-for-all-fqdns.patch * fix-bsc-1065792.patch * fix-decrease-loglevel-when-unable-to-resolve-addr.patch * fix-for-ec2-rate-limit-failures.patch OBS-URL: https://build.opensuse.org/request/show/626472 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=127
58 lines
1.7 KiB
Diff
58 lines
1.7 KiB
Diff
From c4d9227b6da4407348e181f092445f17e3c14b51 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
|
|
<psuarezhernandez@suse.com>
|
|
Date: Thu, 26 Jul 2018 16:42:10 +0100
|
|
Subject: [PATCH] Avoid incomprehensive message if crashes
|
|
|
|
Check dmidecoder executable on each call to avoid crashing
|
|
|
|
Fix pylint issues
|
|
---
|
|
salt/modules/smbios.py | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
diff --git a/salt/modules/smbios.py b/salt/modules/smbios.py
|
|
index c8a0e54a5c..c0b94c2a65 100644
|
|
--- a/salt/modules/smbios.py
|
|
+++ b/salt/modules/smbios.py
|
|
@@ -19,6 +19,7 @@ import re
|
|
|
|
# Import salt libs
|
|
import salt.utils.path
|
|
+from salt.exceptions import CommandExecutionError
|
|
|
|
# Solve the Chicken and egg problem where grains need to run before any
|
|
# of the modules are loaded and are generally available for any usage.
|
|
@@ -32,10 +33,16 @@ log = logging.getLogger(__name__)
|
|
DMIDECODER = salt.utils.path.which_bin(['dmidecode', 'smbios'])
|
|
|
|
|
|
+def _refresh_dmidecoder():
|
|
+ global DMIDECODER
|
|
+ DMIDECODER = salt.utils.path.which_bin(['dmidecode', 'smbios'])
|
|
+
|
|
+
|
|
def __virtual__():
|
|
'''
|
|
Only work when dmidecode is installed.
|
|
'''
|
|
+ _refresh_dmidecoder()
|
|
if DMIDECODER is None:
|
|
log.debug('SMBIOS: neither dmidecode nor smbios found!')
|
|
return (False, 'The smbios execution module failed to load: neither dmidecode nor smbios in the path.')
|
|
@@ -327,6 +334,10 @@ def _dmidecoder(args=None):
|
|
'''
|
|
Call DMIdecode
|
|
'''
|
|
+ _refresh_dmidecoder()
|
|
+ if DMIDECODER is None:
|
|
+ raise CommandExecutionError('SMBIOS: neither dmidecode nor smbios found!')
|
|
+
|
|
if args is None:
|
|
return salt.modules.cmdmod._run_quiet(DMIDECODER)
|
|
else:
|
|
--
|
|
2.17.1
|
|
|
|
|