diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-01-23 16:56:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-23 16:56:53 -0500 |
| commit | 9cf71a7433ec16aa82436b6b611688c9ff250490 (patch) | |
| tree | 76ccc91856634e666b23f248d8f03b1398218bb3 /setuptools/command/egg_info.py | |
| parent | 094862cd6c1683b6a861e8824a96ef74dfd1a8d0 (diff) | |
| parent | 56274b32724933cd2016488c4e667e86d30572ef (diff) | |
| download | python-setuptools-git-9cf71a7433ec16aa82436b6b611688c9ff250490.tar.gz | |
Merge pull request #936 from LeadSift/master
fixes #935 - allows for glob syntax in graft
Diffstat (limited to 'setuptools/command/egg_info.py')
| -rwxr-xr-x | setuptools/command/egg_info.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 5ab54dc7..62bf00aa 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -429,7 +429,9 @@ class FileList(_FileList): def graft(self, dir): """Include all files from 'dir/'.""" - found = distutils.filelist.findall(dir) + found = [] + for match_dir in glob(dir): + found += distutils.filelist.findall(match_dir) self.extend(found) return bool(found) |