Fix states.file checking directory permissions recursively

A change was introduced in 79f6b42 (PR saltstack#50653) to check the file mode recursively. This change introduced a variable shadow that caused directory permission checking to fail.
Akm0d · Jun 5, 2019 · f49dd0f · f49dd0f
1 parent 26fd01a
commit f49dd0f
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/salt/states/file.py b/salt/states/file.py
@@ -731,13 +731,14 @@ def _check_directory(name,
             group = None
         if 'mode' not in recurse_set:
             mode = None
+            file_mode = None
+
         check_files = 'ignore_files' not in recurse_set
         check_dirs = 'ignore_dirs' not in recurse_set
         for root, dirs, files in walk_l:
             if check_files:
                 for fname in files:
                     fchange = {}
-                    mode = file_mode
                     path = os.path.join(root, fname)
                     stats = __salt__['file.stats'](
                         path, None, follow_symlinks
@@ -746,8 +747,8 @@ def _check_directory(name,
                         fchange['user'] = user
                     if group is not None and group != stats.get('group'):
                         fchange['group'] = group
-                    if mode is not None and mode != stats.get('mode'):
-                        fchange['mode'] = mode
+                    if file_mode is not None and file_mode != stats.get('mode'):
+                        fchange['mode'] = file_mode
                     if fchange:
                         changes[path] = fchange
             if check_dirs: