Merge pull request #51333 from Ch3LL/merge-2018.3

[2018.3] Merge forward from 2017.7 to 2018.3
This commit is contained in:
Pedro Algarvio 2019-01-25 20:51:20 +00:00 committed by GitHub
commit 14a84e803c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3276,7 +3276,7 @@ def directory(name,
ret, _ = __salt__['file.check_perms'](
full, ret, user, group, file_mode, None, follow_symlinks)
except CommandExecutionError as exc:
if not exc.strerror.endswith('does not exist'):
if not exc.strerror.startswith('Path not found'):
errors.append(exc.strerror)
if check_dirs: