Attachment 215694 Details for Bug 247372 – patch

[patch] patch

salt.diff (text/plain), 3.05 KB, created by Kirill Ponomarev on 2020-06-18 07:46:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kirill Ponomarev

Created: 2020-06-18 07:46:33 UTC

Size: 3.05 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 539501)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	salt
>-PORTVERSION=	3000.3
>+PORTVERSION=	3001
> CATEGORIES=	sysutils python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: distinfo
>===================================================================
>--- distinfo	(revision 539501)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1590047008
>-SHA256 (salt-3000.3.tar.gz) = fcca49985e697d914e5a7f34b2fd8bbd833bcf7779d30174a279a4de2294cea7
>-SIZE (salt-3000.3.tar.gz) = 15237557
>+TIMESTAMP = 1592464695
>+SHA256 (salt-3001.tar.gz) = 5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154
>+SIZE (salt-3001.tar.gz) = 14448043
>Index: files/patch-salt_loader.py
>===================================================================
>--- files/patch-salt_loader.py	(revision 539501)
>+++ files/patch-salt_loader.py	(working copy)
>@@ -1,11 +1,13 @@
>---- salt/loader.py
>+--- salt/loader.py.orig	2020-06-18 07:20:08 UTC
> +++ salt/loader.py
>-@@ -1240,7 +1240,7 @@
>+@@ -1383,9 +1383,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
>                  try:
>                      pycache_files = [
>-                         os.path.join('__pycache__', x) for x in
>--                        sorted(os.listdir(os.path.join(mod_dir, '__pycache__')))
>-+                        sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc')
>+                         os.path.join("__pycache__", x)
>+-                        for x in sorted(
>+-                            os.listdir(os.path.join(mod_dir, "__pycache__"))
>+-                        )
>++                        for x in sorted(os.listdir(os.path.join(mod_dir, '__pycache__'))) if not x.endswith('opt-1.pyc') and not x.endswith('opt-2.pyc')
>                      ]
>                  except OSError:
>                      pass
>Index: files/patch-setup.py
>===================================================================
>--- files/patch-setup.py	(revision 539501)
>+++ files/patch-setup.py	(working copy)
>@@ -1,13 +1,13 @@
>---- setup.py.orig	2018-04-02 16:35:13 UTC
>+--- setup.py.orig	2020-06-18 07:24:31 UTC
> +++ setup.py
>-@@ -992,8 +992,8 @@ class SaltDistribution(distutils.dist.Di
>+@@ -1119,8 +1119,8 @@ class SaltDistribution(distutils.dist.Distribution):
>      def _property_data_files(self):
>          # Data files common to all scenarios
>          data_files = [
>--            ('share/man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.1']),
>--            ('share/man/man7', ['doc/man/salt.7'])
>+-            ("share/man/man1", ["doc/man/salt-call.1", "doc/man/salt-run.1"]),
>+-            ("share/man/man7", ["doc/man/salt.7"]),
> +            ('man/man1', ['doc/man/salt-call.1', 'doc/man/salt-run.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')
>+             data_files[0][1].append("doc/man/salt-ssh.1")

Actions: View | Diff

Attachments on bug 247372: 215694