Merge pull request #50690 from garethgreenaway/50016_ensure_path_is_str

[2018.3] fixes to augeas_cfg module
This commit is contained in:
Mike Place 2018-11-30 11:44:41 -07:00 committed by GitHub
commit 7cb2405e48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -43,6 +43,7 @@ except ImportError:
# Import salt libs
import salt.utils.args
import salt.utils.data
import salt.utils.stringutils
from salt.exceptions import SaltInvocationError
log = logging.getLogger(__name__)
@ -494,7 +495,7 @@ def ls(path, load_path=None): # pylint: disable=C0103
def _match(path):
''' Internal match function '''
try:
matches = aug.match(path)
matches = aug.match(salt.utils.stringutils.to_str(path))
except RuntimeError:
return {}