- Update to 2018.3.2

- Fix the py3 loader issue

PR:		231609
Submitted by:	christer.edwards@gmail.com(maintainer)
This commit is contained in:
Wen Heping 2018-09-24 13:45:55 +00:00
parent 7821430e45
commit 441be23c75
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=480606
3 changed files with 15 additions and 5 deletions

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= salt
PORTVERSION= 2018.3.1
PORTREVISION= 0
PORTVERSION= 2018.3.2
CATEGORIES= sysutils python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1528982610
SHA256 (salt-2018.3.1.tar.gz) = 7b1d59067b8eb61a23884078e0b8afc02ed8800c5c00f09405ae9e03491ed3db
SIZE (salt-2018.3.1.tar.gz) = 12939682
TIMESTAMP = 1534903119
SHA256 (salt-2018.3.2.tar.gz) = d86eeea2e5387f4a64bbf0a11d103bfc8aac1122e19d39cc0945d33efdc797bd
SIZE (salt-2018.3.2.tar.gz) = 12996445

View File

@ -0,0 +1,11 @@
--- salt/loader.py
+++ salt/loader.py
@@ -1240,7 +1240,7 @@
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')
]
except OSError:
pass