Attachment 162108 Details for Bug 203812 – patch

patch

py-salt-2015.8.1.diff.txt (text/plain), 4.11 KB, created by Christer Edwards on 2015-10-16 03:50:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christer Edwards

Created: 2015-10-16 03:50:18 UTC

Size: 4.11 KB

patch

obsolete

>diff -ruN py-salt/Makefile py-salt-2015.8.1/Makefile
>--- py-salt/Makefile	2015-09-27 08:32:04.000000000 -0600
>+++ py-salt-2015.8.1/Makefile	2015-10-15 20:17:05.921724515 -0600
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/sysutils/py-salt/Makefile 398042 2015-09-27 14:32:04Z junovitch $
> 
> PORTNAME=	salt
>-PORTVERSION=	2015.8.0
>-PORTREVISION=	1
>+PORTVERSION=	2015.8.1
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>diff -ruN py-salt/distinfo py-salt-2015.8.1/distinfo
>--- py-salt/distinfo	2015-09-12 18:02:21.000000000 -0600
>+++ py-salt-2015.8.1/distinfo	2015-10-15 20:17:08.359723545 -0600
>@@ -1,2 +1,2 @@
>-SHA256 (salt-2015.8.0.tar.gz) = 71e1cb2eb1d4b30f3247f5590c00a2089190b8f9a90c9330dc9a65fae517ec9b
>-SIZE (salt-2015.8.0.tar.gz) = 6584668
>+SHA256 (salt-2015.8.1.tar.gz) = 04133839b4632859ad696a40261d1d14b62902dbcaf7df2f9e5e926c89401c23
>+SIZE (salt-2015.8.1.tar.gz) = 6527650
>diff -ruN py-salt/files/patch-salt__utils____init__.py py-salt-2015.8.1/files/patch-salt__utils____init__.py
>--- py-salt/files/patch-salt__utils____init__.py	2015-09-12 18:02:21.000000000 -0600
>+++ py-salt-2015.8.1/files/patch-salt__utils____init__.py	1969-12-31 17:00:00.000000000 -0700
>@@ -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
>diff -ruN py-salt/pkg-plist py-salt-2015.8.1/pkg-plist
>--- py-salt/pkg-plist	2015-09-12 18:02:21.000000000 -0600
>+++ py-salt-2015.8.1/pkg-plist	2015-10-15 20:19:22.484715300 -0600
>@@ -889,8 +889,6 @@
> %%PYTHON_SITELIBDIR%%/salt/modules/system.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.py
> %%PYTHON_SITELIBDIR%%/salt/modules/system_profiler.pyc
>-%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.py
>-%%PYTHON_SITELIBDIR%%/salt/modules/system_rest_sample.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/systemd.py
> %%PYTHON_SITELIBDIR%%/salt/modules/systemd.pyc
> %%PYTHON_SITELIBDIR%%/salt/modules/temp.py

Flags:

koobs: maintainer-approval+

Actions: View

Attachments on bug 203812: 162108 | 162109