From e0bd38e357b89880dde1340a4089aacc1af4a89b Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 13 Dec 2014 15:07:15 -0500 Subject: Move invocation bypass into function itself, pertinent to the docstring. --- setuptools/command/egg_info.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'setuptools/command') 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) -- cgit v1.2.1