forked from Lainports/freebsd-ports
062a1e423b
- Update to 2014.1.0 - Moved py-salt-cloud because py-salt included cloud part - Link to full changelog: http://docs.saltstack.com/topics/releases/2014.1.0.html PR: ports/186950 Submitted by: Christer Edwards <christer.edwards@gmail.com> (maintainer)
18 lines
738 B
Python
18 lines
738 B
Python
--- ./salt/utils/__init__.py.orig 2014-02-19 22:21:15.000000000 +0200
|
|
+++ ./salt/utils/__init__.py 2014-03-06 10:50:07.000000000 +0200
|
|
@@ -316,6 +316,15 @@
|
|
if os.access(exe, os.X_OK):
|
|
return exe
|
|
|
|
+ p = os.environ.get('PATH')
|
|
+ if p is not None:
|
|
+ pp = p.split(os.pathsep)
|
|
+ if '/usr/local/bin' not in pp:
|
|
+ pp.append('/usr/local/bin')
|
|
+ if '/usr/local/sbin' not in pp:
|
|
+ pp.append('/usr/local/sbin')
|
|
+ os.environ['PATH'] = os.pathsep.join(pp)
|
|
+
|
|
# default path based on busybox's default
|
|
default_path = '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin'
|
|
search_path = os.environ.get('PATH', default_path)
|