diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-13 15:07:15 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-12-13 15:07:15 -0500 |
| commit | e0bd38e357b89880dde1340a4089aacc1af4a89b (patch) | |
| tree | dc2ac9578fb9821aeff38c32bd63bb36e0cfac1d /setuptools/command | |
| parent | fec71bcbc8b0aa6bde0b0d054587bcd9c08019e9 (diff) | |
| download | external_python_setuptools-e0bd38e357b89880dde1340a4089aacc1af4a89b.tar.gz external_python_setuptools-e0bd38e357b89880dde1340a4089aacc1af4a89b.tar.bz2 external_python_setuptools-e0bd38e357b89880dde1340a4089aacc1af4a89b.zip | |
Move invocation bypass into function itself, pertinent to the docstring.
Diffstat (limited to 'setuptools/command')
| -rwxr-xr-x | setuptools/command/egg_info.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py index 782b2777..e1324127 100755 --- a/setuptools/command/egg_info.py +++ b/setuptools/command/egg_info.py @@ -325,8 +325,7 @@ class manifest_maker(sdist): elif os.path.exists(self.manifest): self.read_manifest() ei_cmd = self.get_finalized_command('egg_info') - if ei_cmd.egg_base != os.curdir: - self._add_egg_info(cmd=ei_cmd) + self._add_egg_info(cmd=ei_cmd) self.filelist.include_pattern("*", prefix=ei_cmd.egg_info) def _add_egg_info(self, cmd): @@ -345,6 +344,10 @@ class manifest_maker(sdist): (which is looking for the absolute cmd.egg_info) will match them. """ + if cmd.egg_base == os.curdir: + # egg-info files were already added by something else + return + discovered = distutils.filelist.findall(cmd.egg_base) resolved = (os.path.join(cmd.egg_base, path) for path in discovered) self.filelist.allfiles.extend(resolved) |