Merge branch '2017.7' into '2018.3'

Conflicts:
  - .codecov.yml
This commit is contained in:
Ch3LL 2019-01-25 13:06:23 -05:00
commit ae62ebce8b
No known key found for this signature in database
GPG key ID: 132B55A7C13EFA73

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: