diff --git a/sysutils/salt/Makefile b/sysutils/salt/Makefile index bfe644612ef0f..92ac8b2c1bada 100644 --- a/sysutils/salt/Makefile +++ b/sysutils/salt/Makefile @@ -1,6 +1,6 @@ # $NetBSD: Makefile,v 1.42 2016/09/19 13:34:37 jperkin Exp $ -DISTNAME= salt-2016.3.4 +DISTNAME= salt-2016.3.3 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_PYPI:=s/salt/} diff --git a/sysutils/salt/distinfo b/sysutils/salt/distinfo index 03adcb69e7851..4b9f074fabe20 100644 --- a/sysutils/salt/distinfo +++ b/sysutils/salt/distinfo @@ -4,6 +4,5 @@ SHA1 (salt-2016.3.3.tar.gz) = 9c52a7401c0600cc422ccaa2406909bd6ac71db0 RMD160 (salt-2016.3.3.tar.gz) = 66f5b1615d59d200f82184a142a1a0597fe877ff SHA512 (salt-2016.3.3.tar.gz) = 46a8f8b3213e4cc02eaed95e7fc28ce224fe07fe2aea39b68ff3e97043021951558f04690f7043510c8dfb62d76fe82192d67de6151c7f1076a23c0f8d796c9e Size (salt-2016.3.3.tar.gz) = 7952361 bytes -SHA1 (patch-salt_modules_status.py) = 4b2bec94a8554c656baa227ad973b71d2a56d48d SHA1 (patch-salt_utils_____init____.py) = 61f11da63f26af69334f3eca957d596486396ab0 SHA1 (patch-salt_utils_network.py) = 13db1609939b8e8390656904af86ba92408bb44a diff --git a/sysutils/salt/patches/patch-salt_modules_status.py b/sysutils/salt/patches/patch-salt_modules_status.py deleted file mode 100644 index 257a77da7796d..0000000000000 --- a/sysutils/salt/patches/patch-salt_modules_status.py +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-salt_modules_status.py,v 1.3 2016/09/19 13:34:37 jperkin Exp $ - -Avoid a crash in "status.diskusage" when not on Linux or FreeBSD - ---- salt/modules/status.py.orig 2016-08-26 18:55:37.000000000 +0000 -+++ salt/modules/status.py -@@ -603,6 +603,8 @@ def diskusage(*args): - ifile = __salt__['cmd.run']('mount -p').splitlines() - elif __grains__['kernel'] == 'SunOS': - ifile = __salt__['cmd.run']('mount -p').splitlines() -+ else: -+ ifile = [] - - for line in ifile: - comps = line.split()