Date: Thu, 18 Jun 2020 15:15:00 +0000 (UTC) From: Kirill Ponomarev <krion@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r539547 - in branches/2020Q2/sysutils/py-salt: . files Message-ID: <202006181515.05IFF0pN048653@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: krion Date: Thu Jun 18 15:15:00 2020 New Revision: 539547 URL: https://svnweb.freebsd.org/changeset/ports/539547 Log: MFH: r539546 Update to 3001 Sodium. Changes: https://salt.tips/whats-new-in-salt-sodium/ PR: 247372 Approved by: maintainer Approved by: portmgr (blanket) Modified: branches/2020Q2/sysutils/py-salt/Makefile branches/2020Q2/sysutils/py-salt/distinfo branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py branches/2020Q2/sysutils/py-salt/files/patch-setup.py Directory Properties: branches/2020Q2/ (props changed) Modified: branches/2020Q2/sysutils/py-salt/Makefile ============================================================================== --- branches/2020Q2/sysutils/py-salt/Makefile Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/Makefile Thu Jun 18 15:15:00 2020 (r539547) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= salt -PORTVERSION= 2019.2.5 +PORTVERSION= 3001 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: branches/2020Q2/sysutils/py-salt/distinfo ============================================================================== --- branches/2020Q2/sysutils/py-salt/distinfo Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/distinfo Thu Jun 18 15:15:00 2020 (r539547) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589397818 -SHA256 (salt-2019.2.5.tar.gz) = 7d7b80f17017a34bf86c6d7d6b7a94df78694d1401e69192aa3abd406f0edf3f -SIZE (salt-2019.2.5.tar.gz) = 14574347 +TIMESTAMP = 1592464695 +SHA256 (salt-3001.tar.gz) = 5ca60d1b2cc8e63db50995bd8b117914eeaf57c48ce2b3a3731ee57163adf154 +SIZE (salt-3001.tar.gz) = 14448043 Modified: branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py ============================================================================== --- branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/files/patch-salt_loader.py Thu Jun 18 15:15:00 2020 (r539547) @@ -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 Modified: branches/2020Q2/sysutils/py-salt/files/patch-setup.py ============================================================================== --- branches/2020Q2/sysutils/py-salt/files/patch-setup.py Thu Jun 18 15:03:31 2020 (r539546) +++ branches/2020Q2/sysutils/py-salt/files/patch-setup.py Thu Jun 18 15:15:00 2020 (r539547) @@ -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")
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006181515.05IFF0pN048653>