From e2072932e3eff1f9033872949e22efcd17e62c96 Mon Sep 17 00:00:00 2001
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Wed, 3 Aug 2016 18:26:42 +0000
Subject: Update to version 2016.3.2

PR:		211532
Submitted by:	Andres Montalban
Approved by:	Christer Edwards (maintainer)
---
 sysutils/py-salt/files/patch-salt_grains_core.py | 12 ----------
 sysutils/py-salt/files/patch-salt_states_cron.py | 28 ------------------------
 2 files changed, 40 deletions(-)
 delete mode 100644 sysutils/py-salt/files/patch-salt_grains_core.py
 delete mode 100644 sysutils/py-salt/files/patch-salt_states_cron.py

(limited to 'sysutils/py-salt/files')

diff --git a/sysutils/py-salt/files/patch-salt_grains_core.py b/sysutils/py-salt/files/patch-salt_grains_core.py
deleted file mode 100644
index 04794a04deff..000000000000
--- a/sysutils/py-salt/files/patch-salt_grains_core.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# Issue #33608
-# https://github.com/saltstack/salt/issues/33608
---- salt/grains/core.py.orig	2016-05-25 22:30:31 UTC
-+++ salt/grains/core.py
-@@ -1422,6 +1422,7 @@ def os_data():
-     else:
-         grains['os'] = grains['kernel']
-     if grains['kernel'] == 'FreeBSD':
-+        grains.update(_bsd_cpudata(grains))
-         try:
-             grains['osrelease'] = __salt__['cmd.run']('freebsd-version -u').split('-')[0]
-         except salt.exceptions.CommandExecutionError:
diff --git a/sysutils/py-salt/files/patch-salt_states_cron.py b/sysutils/py-salt/files/patch-salt_states_cron.py
deleted file mode 100644
index 325f446d7f18..000000000000
--- a/sysutils/py-salt/files/patch-salt_states_cron.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Fixes cron.file from upstream issue #34094/#34095 [1].  This will be in
-# 2016.3.2.
-# https://github.com/saltstack/salt/issues/34094
-# https://github.com/saltstack/salt/pull/34095
---- salt/states/cron.py.orig    2016-06-13 22:17:50 UTC
-+++ salt/states/cron.py
-@@ -540,6 +540,7 @@ def file(name,
-             __env__,
-             context,
-             defaults,
-+            False,        # skip_verify
-             **kwargs
-         )
-     except Exception as exc:
-@@ -573,12 +574,12 @@ def file(name,
-         ret['comment'] = 'Unable to manage file: {0}'.format(exc)
-         return ret
- 
-+    cron_ret = None
-     if ret['changes']:
-         cron_ret = __salt__['cron.write_cron_file_verbose'](user, cron_path)
-         ret['changes'] = {'diff': ret['changes']['diff']}
-         ret['comment'] = 'Crontab for user {0} was updated'.format(user)
-     elif ret['result']:
--        cron_ret = None
-         ret['comment'] = 'Crontab for user {0} is in the correct ' \
-                          'state'.format(user)
- 
-- 
cgit v1.2.3