Date: Wed, 13 Jul 2016 01:54:29 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r418456 - in branches/2016Q3/sysutils/py-salt: . files Message-ID: <201607130154.u6D1sTiJ017954@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: junovitch Date: Wed Jul 13 01:54:29 2016 New Revision: 418456 URL: https://svnweb.freebsd.org/changeset/ports/418456 Log: MFH: r418455 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. - https://github.com/saltstack/salt/issues/34094 - https://github.com/saltstack/salt/pull/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] - https://github.com/saltstack/salt/issues/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) Added: branches/2016Q3/sysutils/py-salt/files/patch-salt_grains_core.py - copied unchanged from r418455, head/sysutils/py-salt/files/patch-salt_grains_core.py branches/2016Q3/sysutils/py-salt/files/patch-salt_states_cron.py - copied unchanged from r418455, head/sysutils/py-salt/files/patch-salt_states_cron.py Modified: branches/2016Q3/sysutils/py-salt/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/sysutils/py-salt/Makefile ============================================================================== --- branches/2016Q3/sysutils/py-salt/Makefile Wed Jul 13 01:53:45 2016 (r418455) +++ branches/2016Q3/sysutils/py-salt/Makefile Wed Jul 13 01:54:29 2016 (r418456) @@ -3,6 +3,7 @@ PORTNAME= salt PORTVERSION= 2016.3.1 +PORTREVISION= 1 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Copied: branches/2016Q3/sysutils/py-salt/files/patch-salt_grains_core.py (from r418455, head/sysutils/py-salt/files/patch-salt_grains_core.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/sysutils/py-salt/files/patch-salt_grains_core.py Wed Jul 13 01:54:29 2016 (r418456, copy of r418455, head/sysutils/py-salt/files/patch-salt_grains_core.py) @@ -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: Copied: branches/2016Q3/sysutils/py-salt/files/patch-salt_states_cron.py (from r418455, head/sysutils/py-salt/files/patch-salt_states_cron.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/sysutils/py-salt/files/patch-salt_states_cron.py Wed Jul 13 01:54:29 2016 (r418456, copy of r418455, head/sysutils/py-salt/files/patch-salt_states_cron.py) @@ -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) +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607130154.u6D1sTiJ017954>