diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2020-10-22 14:00:36 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2020-10-22 14:00:36 +0000 |
| commit | c9b6b11d28648acb01cad8d2173dc899b845c829 (patch) | |
| tree | 42d79096fc6a97acb3dddde3cda0e5f1bcf55203 /sysutils/py-salt/files | |
| parent | Remove -march=ivybridge from CFLAGS and CXXFLAGS if present since this (diff) | |
Update to 3002
Changes: https://salt.tips/whats-new-in-salt-magnesium
PR: 250519
Approved by: maintainer
Notes
Notes:
svn path=/head/; revision=552978
Diffstat (limited to 'sysutils/py-salt/files')
| -rw-r--r-- | sysutils/py-salt/files/patch-salt_loader.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/sysutils/py-salt/files/patch-salt_loader.py b/sysutils/py-salt/files/patch-salt_loader.py index f889f3c70adb..85d8b86a799f 100644 --- a/sysutils/py-salt/files/patch-salt_loader.py +++ b/sysutils/py-salt/files/patch-salt_loader.py @@ -1,13 +1,11 @@ ---- salt/loader.py.orig 2020-06-18 07:20:08 UTC +--- salt/loader.py.orig 2020-10-22 05:33:25 UTC +++ salt/loader.py -@@ -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__")) -- ) -+ 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 +@@ -1468,7 +1468,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__"))) ++ 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 |