Correct bug introduced yesterday in 2021.2.1

mirceaulinic · Feb 19, 2021 · 8d2639f · 8d2639f
1 parent d27140b
commit 8d2639f
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/isalt/scripts.py b/isalt/scripts.py
@@ -330,16 +330,14 @@ def _napalm_is_proxy(opts):
                 file_roots.append(sproxy_path)
                 __opts__['file_roots'][saltenv] = file_roots
             sproxy_dirs = [
-                sproxy_dir
+                (sproxy_dir[:-1] if sproxy_dir[-1] == 's' else sproxy_dir)
                 for sproxy_dir in os.listdir(sproxy_path)
                 if sproxy_dir.startswith('_')
                 and not sproxy_dir.startswith('__')
                 and os.path.isdir(os.path.join(sproxy_path, sproxy_dir))
             ]
             for sproxy_dir in sproxy_dirs:
-                sproxy_dirs_opts = '{}_dirs'.format(
-                    sproxy_dir.replace('_', '', 1).replace('s', '', -1)
-                )
+                sproxy_dirs_opts = '{}_dirs'.format(sproxy_dir.replace('_', '', 1))
                 if sproxy_dirs_opts not in __opts__:
                     __opts__[sproxy_dirs_opts] = []
                 sproxy_dir_path = os.path.join(sproxy_path, sproxy_dir)