valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22289 from achernev/develop

Browse Source 
Expand glob patterns in the path argument of file.find
This commit is contained in:
Thomas S Hatch 2015-04-02 12:53:07 -06:00
commit 368bfa377e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/file.py
View File

@ -686,7 +686,7 @@ def find(path, *args, **kwargs):
except ValueError as ex:
return 'error: {0}'.format(ex)
ret = [p for p in finder.find(os.path.expanduser(path))]
ret = [item for i in [finder.find(p) for p in glob.glob(os.path.expanduser(path))] for item in i]
ret.sort()
return ret