Attachment 152114 Details for Bug 197061 – update patch

update patch

py-salt-2014.7.1.diff.txt (text/plain), 7.52 KB, created by Christer Edwards on 2015-01-25 02:33:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2015-01-25 02:33:49 UTC

Size: 7.52 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt-2014.7.1/Makefile
>--- py-salt/Makefile	2015-01-01 20:30:42.000000000 -0700
>+++ py-salt-2014.7.1/Makefile	2015-01-24 16:55:13.424235324 -0700
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/sysutils/py-salt/Makefile 376039 2015-01-02 03:30:42Z koobs $
> 
> PORTNAME=	salt
>-PORTVERSION=	2014.7.0
>-PORTREVISION=	1
>+PORTVERSION=	2014.7.1
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt/distinfo py-salt-2014.7.1/distinfo
>--- py-salt/distinfo	2014-11-09 15:07:25.000000000 -0700
>+++ py-salt-2014.7.1/distinfo	2015-01-22 22:21:08.124796428 -0700
>@@ -1,2 +1,2 @@
>-SHA256 (salt-2014.7.0.tar.gz) = d4a64436636a5e6839c1ae1d16052d2e965b9aed5c3c58735bd89fddb9a0ed5c
>-SIZE (salt-2014.7.0.tar.gz) = 3518342
>+SHA256 (salt-2014.7.1.tar.gz) = fbb292ec9bd77fce0965bfaf429021916edbee83f6544c0216738d8653fff10a
>+SIZE (salt-2014.7.1.tar.gz) = 3583585
>diff -ruN py-salt/files/patch-salt__grains__core.py py-salt-2014.7.1/files/patch-salt__grains__core.py
>--- py-salt/files/patch-salt__grains__core.py	2014-11-09 15:07:25.000000000 -0700
>+++ py-salt-2014.7.1/files/patch-salt__grains__core.py	2015-01-24 14:54:52.396733243 -0700
>@@ -1,11 +1,11 @@
>---- ./salt/grains/core.py.orig  2014-11-03 12:38:21.000000000 -0700
>-+++ ./salt/grains/core.py       2014-11-04 13:34:47.769728417 -0700
>-@@ -1320,7 +1320,7 @@
>+--- salt/grains/core.py.orig	2015-01-24 14:54:03.078736129 -0700
>++++ salt/grains/core.py	2015-01-24 14:53:12.000000000 -0700
>+@@ -1321,7 +1321,7 @@
>      '''
>      # Provides:
>      #   path
>--    return {'path': os.environ['PATH'].strip()}
>-+    return {'path': os.environ['PATH'].strip() + ':/usr/local/bin:/usr/local/sbin'}
>+-    return {'path': os.environ.get('PATH', '').strip()}
>++    return {'path': os.environ.get('PATH', '').strip() + ':/usr/local/bin:/usr/local/sbin'}
>  
>  
>  def pythonversion():
>diff -ruN py-salt/files/patch-setup.py py-salt-2014.7.1/files/patch-setup.py
>--- py-salt/files/patch-setup.py	2014-11-09 15:07:25.000000000 -0700
>+++ py-salt-2014.7.1/files/patch-setup.py	2015-01-24 15:00:16.186710409 -0700
>@@ -1,33 +1,13 @@
>---- setup.py.orig	2014-11-03 12:38:21.000000000 -0700
>-+++ setup.py        2014-11-04 14:42:58.775471457 -0700
>-@@ -212,12 +212,12 @@
>-             self.distribution.package_data.pop('salt.daemons.flo', None)
>-             self.filelist.files.append(os.path.basename(PACKAGED_FOR_SALT_SSH_FILE))
>-             self.distribution.metadata.name = 'salt-ssh'
>--            self.distribution.data_files = [('share/man/man1',
>-+            self.distribution.data_files = [('man/man1',
>-                                              ['doc/man/salt-ssh.1',
>-                                               'doc/man/salt-run.1',
>-                                               'doc/man/salt-call.1',
>-                                               'doc/man/salt-cloud.1']),
>--                                            ('share/man/man7', ['doc/man/salt.7'])]
>-+                                            ('man/man7', ['doc/man/salt.7'])]
>- 
>-         sdist.make_release_tree(self, base_dir, files)
>- 
>-@@ -666,13 +666,13 @@
>-                                     '*.flo'
>-                                     ]
>-                                 },
>--                'data_files': [('share/man/man1',
>-+                'data_files': [('man/man1',
>-                                 ['doc/man/salt-cp.1',
>-                                  'doc/man/salt-call.1',
>-                                  'doc/man/salt-minion.1',
>-                                  'doc/man/salt-unity.1',
>-                                  ]),
>--                               ('share/man/man7',
>-+                               ('man/man7',
>-                                 ['doc/man/salt.7',
>-                                  ]),
>-                                ],
>+--- setup.py.orig	2015-01-24 14:55:05.507732433 -0700
>++++ setup.py	2015-01-24 14:59:07.595716022 -0700
>+@@ -621,8 +621,8 @@
>+     def _property_data_files(self):
>+         # Data files common to all scenarios
>+         data_files = [
>+-            ('share/man/man1', ['doc/man/salt-call.1']),
>+-            ('share/man/man7', ['doc/man/salt.7'])
>++            ('man/man1', ['doc/man/salt-call.1']),
>++            ('man/man7', ['doc/man/salt.7'])
>+         ]
>+         if self.ssh_packaging or PACKAGED_FOR_SALT_SSH:
>+             data_files[0][1].append('doc/man/salt-ssh.1')
>diff -ruN py-salt/pkg-plist py-salt-2014.7.1/pkg-plist
>--- py-salt/pkg-plist	2014-11-09 15:07:25.000000000 -0700
>+++ py-salt-2014.7.1/pkg-plist	2015-01-24 15:16:12.579644830 -0700
>@@ -12,6 +12,8 @@
> %%PYTHON_SITELIBDIR%%/salt/auth/__init__.pyc
> %%PYTHON_SITELIBDIR%%/salt/auth/auto.py
> %%PYTHON_SITELIBDIR%%/salt/auth/auto.pyc
>+%%PYTHON_SITELIBDIR%%/salt/auth/django.py
>+%%PYTHON_SITELIBDIR%%/salt/auth/django.pyc
> %%PYTHON_SITELIBDIR%%/salt/auth/keystone.py
> %%PYTHON_SITELIBDIR%%/salt/auth/keystone.pyc
> %%PYTHON_SITELIBDIR%%/salt/auth/ldap.py
>@@ -158,12 +160,24 @@
> %%PYTHON_SITELIBDIR%%/salt/daemons/masterapi.pyc
> %%PYTHON_SITELIBDIR%%/salt/daemons/salting.py
> %%PYTHON_SITELIBDIR%%/salt/daemons/salting.pyc
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/__init__.py
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_master.py
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_master.pyc
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_minion.py
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_minion.pyc
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_raetkey.py
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_raetkey.pyc
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_saltkeep.py
>+%%PYTHON_SITELIBDIR%%/salt/daemons/test/test_saltkeep.pyc
> %%PYTHON_SITELIBDIR%%/salt/exceptions.py
> %%PYTHON_SITELIBDIR%%/salt/exceptions.pyc
> %%PYTHON_SITELIBDIR%%/salt/exitcodes.py
> %%PYTHON_SITELIBDIR%%/salt/exitcodes.pyc
> %%PYTHON_SITELIBDIR%%/salt/ext/__init__.py
> %%PYTHON_SITELIBDIR%%/salt/ext/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/salt/ext/six.py
>+%%PYTHON_SITELIBDIR%%/salt/ext/six.pyc
> %%PYTHON_SITELIBDIR%%/salt/fileclient.py
> %%PYTHON_SITELIBDIR%%/salt/fileclient.pyc
> %%PYTHON_SITELIBDIR%%/salt/fileserver/__init__.py
>@@ -816,6 +830,10 @@
> %%PYTHON_SITELIBDIR%%/salt/proxy/junos.pyc
> %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.py
> %%PYTHON_SITELIBDIR%%/salt/proxy/rest_sample.pyc
>+%%PYTHON_SITELIBDIR%%/salt/queues/__init__.py
>+%%PYTHON_SITELIBDIR%%/salt/queues/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/salt/queues/sqlite_queue.py
>+%%PYTHON_SITELIBDIR%%/salt/queues/sqlite_queue.pyc
> %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.py
> %%PYTHON_SITELIBDIR%%/salt/renderers/__init__.pyc
> %%PYTHON_SITELIBDIR%%/salt/renderers/gpg.py
>@@ -942,6 +960,10 @@
> %%PYTHON_SITELIBDIR%%/salt/runners/winrepo.pyc
> %%PYTHON_SITELIBDIR%%/salt/scripts.py
> %%PYTHON_SITELIBDIR%%/salt/scripts.pyc
>+%%PYTHON_SITELIBDIR%%/salt/sdb/__init__.py
>+%%PYTHON_SITELIBDIR%%/salt/sdb/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/salt/sdb/keyring_db.py
>+%%PYTHON_SITELIBDIR%%/salt/sdb/keyring_db.pyc
> %%PYTHON_SITELIBDIR%%/salt/search/__init__.py
> %%PYTHON_SITELIBDIR%%/salt/search/__init__.pyc
> %%PYTHON_SITELIBDIR%%/salt/search/whoosh_search.py
>@@ -988,6 +1010,8 @@
> %%PYTHON_SITELIBDIR%%/salt/states/boto_secgroup.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.py
> %%PYTHON_SITELIBDIR%%/salt/states/boto_sqs.pyc
>+%%PYTHON_SITELIBDIR%%/salt/states/chef.py
>+%%PYTHON_SITELIBDIR%%/salt/states/chef.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/cloud.py
> %%PYTHON_SITELIBDIR%%/salt/states/cloud.pyc
> %%PYTHON_SITELIBDIR%%/salt/states/cmd.py
>@@ -1450,5 +1474,4 @@
> man/man1/salt-ssh.1.gz
> man/man1/salt-syndic.1.gz
> man/man1/salt-unity.1.gz
>-man/man1/salt.1.gz
> man/man7/salt.7.gz

Flags:

koobs: maintainer-approval+

Actions: View

Attachments on bug 197061: 152114 | 152939