cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to salt-2018.3.2

Browse Source
This commit is contained in:
jasper 2018-07-09 12:28:05 +00:00
parent 8e7b073429
commit 2d12e72a76
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/salt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.131 2018/06/14 18:58:26 jasper Exp $
# $OpenBSD: Makefile,v 1.132 2018/07/09 12:28:05 jasper Exp $
# optional dependencies
# https://github.com/saltstack/salt/blob/develop/doc/conf.py#L54
@ -17,7 +17,7 @@
COMMENT = remote execution and configuration management system
MODPY_EGG_VERSION = 2018.3.1
MODPY_EGG_VERSION = 2018.3.2
DISTNAME = salt-${MODPY_EGG_VERSION}
CATEGORIES = sysutils net devel

4
sysutils/salt/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (salt-2018.3.1.tar.gz) = ex1ZBnuOthojiEB44LivwC7YgAxcAPCUBa6eA0ke09s=
SIZE (salt-2018.3.1.tar.gz) = 12939682
SHA256 (salt-2018.3.2.tar.gz) = 2G7uouU4f0pku/ChHRA7/IqsESLhnTnMCUXTPv3Hl70=
SIZE (salt-2018.3.2.tar.gz) = 12996445

6
sysutils/salt/patches/patch-salt_grains_core_py
View File

@ -1,13 +1,13 @@
$OpenBSD: patch-salt_grains_core_py,v 1.1 2018/05/17 12:51:10 jasper Exp $
$OpenBSD: patch-salt_grains_core_py,v 1.2 2018/07/09 12:28:05 jasper Exp $
don't crash when calling swapctl fails, i.e. when there's no swap configured.
Index: salt/grains/core.py
--- salt/grains/core.py.orig
+++ salt/grains/core.py
@@ -452,7 +452,11 @@ def _bsd_memdata(osdata):
@@ -451,7 +451,11 @@ def _bsd_memdata(osdata):
if osdata['kernel'] == 'OpenBSD':
if osdata['kernel'] in ['OpenBSD', 'NetBSD']:
swapctl = salt.utils.path.which('swapctl')
- swap_total = __salt__['cmd.run']('{0} -sk'.format(swapctl)).split(' ')[1]
+ ret = __salt__['cmd.run_all']('{0} -sk'.format(swapctl))