diff options
author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2015-10-16 13:16:32 +0000 |
---|---|---|
committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2015-10-16 13:16:32 +0000 |
commit | 04673c3e98efb34ecc14bcc9e4cd45e2f0aa43ef (patch) | |
tree | b909f25c3ba5ad31a6b0740aa156530681033e03 /sysutils/py-salt/files | |
parent | - Update to 1.0.6 (diff) |
- Update to 2015.8.1
- While I'm here, add LICENSE_FILE
Changes: https://docs.saltstack.com/en/latest/topics/releases/2015.8.1.html
PR: 203812
Submitted by: Christer Edwards <christer.edwards@gmail.com> (maintainer)
Notes
Notes:
svn path=/head/; revision=399467
Diffstat (limited to 'sysutils/py-salt/files')
-rw-r--r-- | sysutils/py-salt/files/patch-salt__utils____init__.py | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/sysutils/py-salt/files/patch-salt__utils____init__.py b/sysutils/py-salt/files/patch-salt__utils____init__.py deleted file mode 100644 index 45deec9ac3ce..000000000000 --- a/sysutils/py-salt/files/patch-salt__utils____init__.py +++ /dev/null @@ -1,83 +0,0 @@ ---- salt/utils/__init__.py.orig -+++ salt/utils/__init__.py -@@ -1532,20 +1532,7 @@ def is_windows(): - ''' - Simple function to return if a host is Windows or not - ''' -- import __main__ as main -- # This is a hack. If a proxy minion is started by other -- # means, e.g. a custom script that creates the minion objects -- # then this will fail. -- is_proxy = False -- try: -- if 'salt-proxy' in main.__file__: -- is_proxy = True -- except AttributeError: -- pass -- if is_proxy: -- return False -- else: -- return sys.platform.startswith('win') -+ return sys.platform.startswith('win') - - - def sanitize_win_path_string(winpath): -@@ -1571,15 +1558,6 @@ def is_proxy(): - TODO: Need to extend this for proxies that might run on - other Unices - ''' -- return not (is_linux() or is_sunos() or is_windows()) -- -- --@real_memoize --def is_linux(): -- ''' -- Simple function to return if a host is Linux or not. -- Note for a proxy minion, we need to return something else -- ''' - import __main__ as main - # This is a hack. If a proxy minion is started by other - # means, e.g. a custom script that creates the minion objects -@@ -1590,10 +1568,16 @@ def is_linux(): - is_proxy = True - except AttributeError: - pass -- if is_proxy: -- return False -- else: -- return sys.platform.startswith('linux') -+ return is_proxy -+ -+ -+@real_memoize -+def is_linux(): -+ ''' -+ Simple function to return if a host is Linux or not. -+ Note for a proxy minion, we need to return something else -+ ''' -+ return sys.platform.startswith('linux') - - - @real_memoize -@@ -1609,20 +1593,7 @@ def is_sunos(): - ''' - Simple function to return if host is SunOS or not - ''' -- import __main__ as main -- # This is a hack. If a proxy minion is started by other -- # means, e.g. a custom script that creates the minion objects -- # then this will fail. -- is_proxy = False -- try: -- if 'salt-proxy' in main.__file__: -- is_proxy = True -- except AttributeError: -- pass -- if is_proxy: -- return False -- else: -- return sys.platform.startswith('sunos') -+ return sys.platform.startswith('sunos') - - - @real_memoize |