CVS commit: pkgsrc/sysutils/salt

["Travis Paul" <tpaul%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tpaul
Date:           Wed Jun 20 15:00:16 UTC 2018

Modified Files:
        pkgsrc/sysutils/salt: Makefile distinfo
        pkgsrc/sysutils/salt/patches: patch-salt_grains_core.py

Log Message:
salt: fix broken patch

bump PKGREVISION

ok <maya>


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/sysutils/salt/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/sysutils/salt/distinfo
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/salt/Makefile
diff -u pkgsrc/sysutils/salt/Makefile:1.63 pkgsrc/sysutils/salt/Makefile:1.64
--- pkgsrc/sysutils/salt/Makefile:1.63  Wed Jun 20 11:50:56 2018
+++ pkgsrc/sysutils/salt/Makefile       Wed Jun 20 15:00:15 2018
@@ -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/}
 

Index: pkgsrc/sysutils/salt/distinfo
diff -u pkgsrc/sysutils/salt/distinfo:1.37 pkgsrc/sysutils/salt/distinfo:1.38
--- pkgsrc/sysutils/salt/distinfo:1.37  Wed Jun 20 11:50:56 2018
+++ pkgsrc/sysutils/salt/distinfo       Wed Jun 20 15:00:15 2018
@@ -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

Index: pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py
diff -u pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py:1.5 pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py:1.6
--- pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py:1.5  Wed Jun 20 11:50:56 2018
+++ pkgsrc/sysutils/salt/patches/patch-salt_grains_core.py      Wed Jun 20 15:00:16 2018
@@ -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]