diff options
| author | maya <maya@pkgsrc.org> | 2018-05-12 11:29:35 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2018-05-12 11:29:35 +0000 |
| commit | 8b64a4ec4c83cd0c54c5df17fed573856a21044e (patch) | |
| tree | 2c80b0f44f11020efff00ecc1ef1777fc5f100a2 /sysutils/salt | |
| parent | 2a211bac38ca4acbe87fd7e6e61029f99484d758 (diff) | |
| download | pkgsrc-8b64a4ec4c83cd0c54c5df17fed573856a21044e.tar.gz | |
salt: don't crash if no swap is configured
(in a netbsd/openbsd specific code block)
from Travis Paul in PR pkg/53278, also upstream pull #47600
bump PKGREVISION
Diffstat (limited to 'sysutils/salt')
| -rw-r--r-- | sysutils/salt/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/salt/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/salt/patches/patch-salt_grains_core.py | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index b8aa645698b..724417cf853 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.59 2018/04/13 07:58:22 adam Exp $ +# $NetBSD: Makefile,v 1.60 2018/05/12 11:29:35 maya Exp $ DISTNAME= salt-2018.3.0 +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index 46957348dc4..c5dce385117 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.34 2018/04/13 07:58:22 adam Exp $ +$NetBSD: distinfo,v 1.35 2018/05/12 11:29:35 maya Exp $ SHA1 (salt-2018.3.0.tar.gz) = b891aa96775a9675fef7ca98a78073fed304e062 RMD160 (salt-2018.3.0.tar.gz) = 54ea78736292c97367c4b34b586bce25b434ecce SHA512 (salt-2018.3.0.tar.gz) = 3d64a4d12d4ff7effe644b682b138d8f49fd00523e9cfe3e80bebff9c944a089fb41cbac92e63139633425f49c1eebeb99145290a0bdd1b4f306da86abe9b2e5 Size (salt-2018.3.0.tar.gz) = 13448567 bytes +SHA1 (patch-salt_grains_core.py) = 735a71cd9616be34cce6b015da7a70cace08accd SHA1 (patch-salt_version.py) = 1827dac3609a938fae38ee5dfd2a873c9723dfbd diff --git a/sysutils/salt/patches/patch-salt_grains_core.py b/sysutils/salt/patches/patch-salt_grains_core.py new file mode 100644 index 00000000000..f7fa7106768 --- /dev/null +++ b/sysutils/salt/patches/patch-salt_grains_core.py @@ -0,0 +1,25 @@ +$NetBSD: patch-salt_grains_core.py,v 1.3 2018/05/12 11:29:35 maya Exp $ + +Prevent crash on NetBSD and OpenBSD when no swap is configured. +https://github.com/saltstack/salt/pull/47600 + +--- salt/grains/core.py.orig 2018-05-11 13:12:38.000000000 +0000 ++++ salt/grains/core.py +@@ -450,11 +450,13 @@ def _bsd_memdata(osdata): + mem = __salt__['cmd.run']('{0} -n hw.physmem64'.format(sysctl)) + grains['mem_total'] = int(mem) // 1024 // 1024 + +- 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] +- else: +- swap_total = __salt__['cmd.run']('{0} -n vm.swap_total'.format(sysctl)) ++ swap_data = __salt__['cmd.run']('{0} -sk'.format(swapctl)) ++ if swap_data == 'no swap devices configured': ++ swap_total = 0 ++ else: ++ swap_total = swap_data.split(' ')[1] + grains['swap_total'] = int(swap_total) // 1024 // 1024 + return grains + |