-
Notifications
You must be signed in to change notification settings - Fork 739
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sysutils/py-salt: add patches to handle runtime regressions in 2016.3.x Fixes cron.file from upstream issue #34094/#34095 [1]. This will be in 2016.3.2. - saltstack/salt#34094 - saltstack/salt#34095 Restore patch for upstream issue #33608. This was patched in 2016.3.0 but removed in the maintainer update to 2016.3.1 in r417508. However the patch has yet to be merged upstream. [2] - saltstack/salt#33608 PR: 210627 [1], 210395 [2] Reported by: Andres Montalban <amontalban@gmail.com> Approved by: Christer Edwards <christer.edwards@gmail.com> (maintainer) Approved by: ports-secteam (with hat)
- Loading branch information
Showing
3 changed files
with
41 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
# 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: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
# 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) | ||
|