diff options
| author | tpaul <tpaul@pkgsrc.org> | 2018-06-20 15:00:15 +0000 |
|---|---|---|
| committer | tpaul <tpaul@pkgsrc.org> | 2018-06-20 15:00:15 +0000 |
| commit | 0837b6a70f9dc70cadb2cd95d2398be81e95b8cb (patch) | |
| tree | 9f8ae714a6a976d14c0fbbe4949d586a1809de1f /sysutils | |
| parent | 48ea00533e1d706af5f97f97c210eee1a4effe75 (diff) | |
| download | pkgsrc-0837b6a70f9dc70cadb2cd95d2398be81e95b8cb.tar.gz | |
salt: fix broken patch
bump PKGREVISION
ok <maya>
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/salt/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/salt/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/salt/patches/patch-salt_grains_core.py | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index 0696e287507..857a5e863fa 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2018/06/20 11:50:56 tpaul Exp $ +# $NetBSD: Makefile,v 1.64 2018/06/20 15:00:15 tpaul Exp $ DISTNAME= salt-2018.3.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index 1294ce8054c..fd9adf8f5b9 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.37 2018/06/20 11:50:56 tpaul Exp $ +$NetBSD: distinfo,v 1.38 2018/06/20 15:00:15 tpaul Exp $ SHA1 (salt-2018.3.1.tar.gz) = 683dc72a84cf3a19dc1a5734837cf5b2dc19ef2a RMD160 (salt-2018.3.1.tar.gz) = 8cc98668c98b89f9d244a665b5a9b76794754b32 SHA512 (salt-2018.3.1.tar.gz) = 38af8f1e8673f14e62d4a01bdb734efe8a7c8ca5cde83ce652ea0b1e260fbe7e3df04e27033c915b8d10c2ac49a88e26dae83b7f27798fb6ab53054a1329a840 Size (salt-2018.3.1.tar.gz) = 12939682 bytes -SHA1 (patch-salt_grains_core.py) = 44c23bbfb76f86027fefcafe83e657f46f5a4871 +SHA1 (patch-salt_grains_core.py) = 5d9c5fbee2a5bf7d0a3f3445fc51c3156cd252e1 SHA1 (patch-salt_modules_pkgin.py) = 7c51659f740508e5b305a31eb0ab6396f522f677 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 index 0adbc388175..bc7cb799e19 100644 --- a/sysutils/salt/patches/patch-salt_grains_core.py +++ b/sysutils/salt/patches/patch-salt_grains_core.py @@ -1,4 +1,4 @@ -$NetBSD: patch-salt_grains_core.py,v 1.5 2018/06/20 11:50:56 tpaul Exp $ +$NetBSD: patch-salt_grains_core.py,v 1.6 2018/06/20 15:00:16 tpaul Exp $ Prevent crash on NetBSD and OpenBSD when no swap is configured. https://github.com/saltstack/salt/pull/47600 @@ -12,7 +12,7 @@ PR: pkg/53278 swapctl = salt.utils.path.which('swapctl') - swap_total = __salt__['cmd.run']('{0} -sk'.format(swapctl)).split(' ')[1] + swap_total = __salt__['cmd.run']('{0} -sk'.format(swapctl)) -+ if swap_data == 'no swap devices configured': ++ if swap_total == 'no swap devices configured': + swap_total = 0 + else: + swap_total = swap_data.split(' ')[1] |