diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2020-06-18 15:15:00 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2020-06-18 15:15:00 +0000 |
commit | 7ff922fd1dcf027f396c92bf974f6645079d7518 (patch) | |
tree | dd36dfa155a84a23f4f332d6f9eb519b8d825000 /sysutils/py-salt/files/patch-salt_loader.py | |
parent | f2d0e1387a4dd182cf2256c37e5fb2ceefa4c1c5 (diff) | |
download | ports-7ff922fd1dcf027f396c92bf974f6645079d7518.tar.gz ports-7ff922fd1dcf027f396c92bf974f6645079d7518.zip |
MFH: r539546
Update to 3001 Sodium.
Changes: https://salt.tips/whats-new-in-salt-sodium/
PR: 247372
Approved by: maintainer
Approved by: portmgr (blanket)
Notes
Notes:
svn path=/branches/2020Q2/; revision=539547
Diffstat (limited to 'sysutils/py-salt/files/patch-salt_loader.py')
-rw-r--r-- | sysutils/py-salt/files/patch-salt_loader.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sysutils/py-salt/files/patch-salt_loader.py b/sysutils/py-salt/files/patch-salt_loader.py index 1578e73b9df7..f889f3c70adb 100644 --- a/sysutils/py-salt/files/patch-salt_loader.py +++ b/sysutils/py-salt/files/patch-salt_loader.py @@ -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 |