b17d3e3575
- Fix the usage of custom macros on the spec file. - Fix RES7: different dependency names for python-PyYAML and python-MarkupSafe - Build both python2 and python3 binaries together. - Bugfix: errors in external pillar causes crash instead of report of them (bsc#1068446) - Fix 'user.present' when 'gid_from_name' is set but group does not exist. - Added: * bugfix-the-logic-according-to-the-exact-described-pu.patch * return-error-when-gid_from_name-and-group-does-not-e.patch - Fix "No service execution module loaded" issue (bsc#1065792) - Set SHELL environment variable Added: * fix-bsc-1065792.patch * set-shell-environment-variable-64.patch - Removed unnecessary logging on shutdown (bsc#1050003) - Renamed patch that adds grain fqdns Changed: * catching-error-when-pidfile-cannot-be-deleted Removed: * fix-for-pidfile-removal-logging Renamed: * add-fqdns-grains -> feat-add-grain-for-all-fqdns OBS-URL: https://build.opensuse.org/request/show/569868 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=107
27 lines
845 B
Diff
27 lines
845 B
Diff
From e9635560f2b0a213518c5023e0b6fb4a11e5570d Mon Sep 17 00:00:00 2001
|
|
From: Mihai Dinca <mdinca@suse.de>
|
|
Date: Fri, 8 Dec 2017 13:34:06 +0100
|
|
Subject: [PATCH] Fix salt-master for old psutil
|
|
|
|
---
|
|
salt/utils/psutil_compat.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/utils/psutil_compat.py b/salt/utils/psutil_compat.py
|
|
index a32712860a..dee563455b 100644
|
|
--- a/salt/utils/psutil_compat.py
|
|
+++ b/salt/utils/psutil_compat.py
|
|
@@ -26,7 +26,7 @@ else:
|
|
# Psuedo "from psutil import *"
|
|
_globals = globals()
|
|
for attr in psutil.__all__:
|
|
- _temp = __import__('psutil', globals(), locals(), [attr], -1)
|
|
+ _temp = __import__('psutil', globals(), locals(), [attr], -1 if six.PY2 else 0)
|
|
try:
|
|
_globals[attr] = getattr(_temp, attr)
|
|
except AttributeError:
|
|
--
|
|
2.15.1
|
|
|
|
|