FreeBSD Bugzilla – Attachment 173200 Details for
Bug 211532
sysutils/py-salt: Update to 2016.3.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to update Saltstack 2016.3.2
py-salt_2016.3.2.diff (text/plain), 3.54 KB, created by
Andres Montalban
on 2016-08-02 19:46:10 UTC
(
hide
)
Description:
Patch to update Saltstack 2016.3.2
Filename:
MIME Type:
Creator:
Andres Montalban
Created:
2016-08-02 19:46:10 UTC
Size:
3.54 KB
patch
obsolete
>diff -urN py-salt.orig/Makefile py-salt/Makefile >--- py-salt.orig/Makefile 2016-08-01 12:44:37.000000000 -0300 >+++ py-salt/Makefile 2016-08-02 16:09:09.000000000 -0300 >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= salt >-PORTVERSION= 2016.3.1 >-PORTREVISION= 1 >+PORTVERSION= 2016.3.2 > CATEGORIES= sysutils python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >diff -urN py-salt.orig/distinfo py-salt/distinfo >--- py-salt.orig/distinfo 2016-07-05 13:24:25.000000000 -0300 >+++ py-salt/distinfo 2016-08-02 16:11:20.000000000 -0300 >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1466111476 >-SHA256 (salt-2016.3.1.tar.gz) = e6bdba4693116430c2af57497eb63399e3a139ac0a7016fa0870b49fbe987f75 >-SIZE (salt-2016.3.1.tar.gz) = 7932479 >+TIMESTAMP = 1470165080 >+SHA256 (salt-2016.3.2.tar.gz) = 6a84b724d02b0dba438dea57650724064675d82620e66749bd2fe8f21da71be0 >+SIZE (salt-2016.3.2.tar.gz) = 8014793 >diff -urN py-salt.orig/files/patch-salt_grains_core.py py-salt/files/patch-salt_grains_core.py >--- py-salt.orig/files/patch-salt_grains_core.py 2016-08-01 12:44:37.000000000 -0300 >+++ py-salt/files/patch-salt_grains_core.py 1969-12-31 21:00:00.000000000 -0300 >@@ -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 -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 2016-08-01 12:44:37.000000000 -0300 >+++ py-salt/files/patch-salt_states_cron.py 1969-12-31 21:00:00.000000000 -0300 >@@ -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) >- >diff -urN py-salt.orig/pkg-plist py-salt/pkg-plist >--- py-salt.orig/pkg-plist 2016-07-05 13:24:25.000000000 -0300 >+++ py-salt/pkg-plist 2016-08-02 16:22:52.000000000 -0300 >@@ -655,6 +655,8 @@ > %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/dbhandle.pyc > %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/exceptions.py > %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/exceptions.pyc >+%%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/kiwiproc.py >+%%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/kiwiproc.pyc > %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/query.py > %%PYTHON_SITELIBDIR%%/salt/modules/inspectlib/query.pyc > %%PYTHON_SITELIBDIR%%/salt/modules/introspect.py
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
christer.edwards
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 211532
: 173200 |
173204