Attachment 171868 Details for Bug 210627 – Patch to fix cron.file in 2016.3.1

[patch] Patch to fix cron.file in 2016.3.1

py-salt_2016.3.1_1.patch (text/plain), 1.47 KB, created by Andres Montalban on 2016-06-27 14:21:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andres Montalban

Created: 2016-06-27 14:21:55 UTC

Size: 1.47 KB

patch

obsolete

>diff -urN py-salt.orig/Makefile py-salt/Makefile
>--- py-salt.orig/Makefile       2016-06-26 00:42:55.000000000 +0000
>+++ py-salt/Makefile    2016-06-27 14:11:30.959449000 +0000
>@@ -3,6 +3,7 @@
> 
> PORTNAME=      salt
> PORTVERSION=   2016.3.1
>+PORTREVISION=  1
> CATEGORIES=    sysutils python
> MASTER_SITES=  CHEESESHOP
> PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
>diff -urN py-salt.orig/files/patch-salt_states_cron.py py-salt/files/patch-salt_states_cron.py
>--- py-salt.orig/files/patch-salt_states_cron.py        1970-01-01 00:00:00.000000000 +0000
>+++ py-salt/files/patch-salt_states_cron.py     2016-06-27 14:10:08.211661000 +0000
>@@ -0,0 +1,24 @@
>+--- salt/states/cron.py.orig   2016-06-27 14:04:19 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)
>+

Actions: View | Diff

Attachments on bug 210627: 171868