diff options
| author | idle sign <idlesign@yandex.ru> | 2016-12-03 22:11:21 +0700 |
|---|---|---|
| committer | idle sign <idlesign@yandex.ru> | 2016-12-03 22:11:21 +0700 |
| commit | 06715b636916cd0a008a973d7a7cdcd16fc2feeb (patch) | |
| tree | 88beab9724593e082cae5b599558a5cf19823596 /setuptools/command/egg_info.py | |
| parent | ef583b282b179d46b9e9066e5714d1d37aeaff3b (diff) | |
| parent | aac9f9f31c0fdb97c52e343be6b8a641b2341232 (diff) | |
| download | python-setuptools-git-06715b636916cd0a008a973d7a7cdcd16fc2feeb.tar.gz | |
Merge branch 'remote_pypa_master' into feat/setupcfg_handling
Diffstat (limited to 'setuptools/command/egg_info.py')
| -rwxr-xr-x | setuptools/command/egg_info.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 6cc8f4c4..8a06e496 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -457,7 +457,7 @@ class FileList(_FileList): """ if self.allfiles is None: self.findall() - match = translate_pattern(os.path.join('**', pattern)) + match = translate_pattern(os.path.join('**', '*' + pattern)) found = [f for f in self.allfiles if match.match(f)] self.extend(found) return bool(found) @@ -466,7 +466,7 @@ class FileList(_FileList): """ Exclude all files anywhere that match the pattern. """ - match = translate_pattern(os.path.join('**', pattern)) + match = translate_pattern(os.path.join('**', '*' + pattern)) return self._remove_files(match.match) def append(self, item): @@ -554,10 +554,17 @@ class manifest_maker(sdist): msg = "writing manifest file '%s'" % self.manifest self.execute(write_file, (self.manifest, files), msg) - def warn(self, msg): # suppress missing-file warnings from sdist - if not msg.startswith("standard file not found:"): + def warn(self, msg): + if not self._should_suppress_warning(msg): sdist.warn(self, msg) + @staticmethod + def _should_suppress_warning(msg): + """ + suppress missing-file warnings from sdist + """ + return re.match(r"standard file .*not found", msg) + def add_defaults(self): sdist.add_defaults(self) self.filelist.append(self.template) |
