- Update to 0.15.3

PR:		ports/179265
Submitted by:	Christer Edwards <christer.edwards@gmail.com> (maintainer)
This commit is contained in:
Frederic Culot 2013-06-05 09:05:45 +00:00
parent 218db049e2
commit 239bc37c09
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=319966
5 changed files with 15 additions and 15 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= salt
PORTVERSION= 0.15.1
PORTVERSION= 0.15.3
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,2 +1,2 @@
SHA256 (salt-0.15.1.tar.gz) = 2bd3bdb38bb7aefebdfaddfef70ebce29e7fa2dc9806e87115a9c6f0915b4f95
SIZE (salt-0.15.1.tar.gz) = 5752766
SHA256 (salt-0.15.3.tar.gz) = 19e2ca70b60cad9a2752d1c16d007a243f3dbf4a00bba24d8ecfba1b59e135b2
SIZE (salt-0.15.3.tar.gz) = 3427038

View File

@ -1,6 +1,6 @@
--- ./salt/grains/core.py.orig 2013-03-19 09:30:55.000000000 +0400
+++ ./salt/grains/core.py 2013-03-20 20:15:36.000000000 +0400
@@ -730,7 +730,7 @@
--- ./salt/grains/core.py.orig 2013-05-29 00:22:30.000000000 -0600
+++ ./salt/grains/core.py 2013-05-31 10:09:03.273791365 -0600
@@ -791,7 +791,7 @@
'''
# Provides:
# path

View File

@ -1,8 +1,8 @@
--- ./salt/utils/__init__.py.orig 2013-03-19 09:30:55.000000000 +0400
+++ ./salt/utils/__init__.py 2013-03-20 20:22:28.000000000 +0400
@@ -228,6 +228,15 @@
# default path based on busybox's default
default_path = "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin"
--- salt/utils/__init__.py.orig 2013-05-29 00:20:55.000000000 -0600
+++ salt/utils/__init__.py 2013-05-31 10:13:41.486795573 -0600
@@ -242,6 +242,15 @@
default_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin'
search_path = os.environ.get('PATH', default_path)
+ p = os.environ.get('PATH')
+ if p is not None:
@ -13,6 +13,6 @@
+ pp.append('/usr/local/sbin')
+ os.environ['PATH'] = os.pathsep.join(pp)
+
for path in os.environ.get('PATH', default_path).split(os.pathsep):
for path in search_path.split(os.pathsep):
full_path = os.path.join(path, exe)
if os.access(full_path, os.X_OK):

View File

@ -275,9 +275,9 @@ bin/salt-syndic
%%PYTHON_SITELIBDIR%%/salt/modules/linux_sysctl.py
%%PYTHON_SITELIBDIR%%/salt/modules/linux_sysctl.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/linux_sysctl.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/locale.py
%%PYTHON_SITELIBDIR%%/salt/modules/locale.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/locale.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/localemod.py
%%PYTHON_SITELIBDIR%%/salt/modules/localemod.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/localemod.pyo
%%PYTHON_SITELIBDIR%%/salt/modules/locate.py
%%PYTHON_SITELIBDIR%%/salt/modules/locate.pyc
%%PYTHON_SITELIBDIR%%/salt/modules/locate.pyo