Merge from master, resolving conflicts.

1 files changed, 3 insertions, 1 deletions

diff --git a/setuptools/command/install_egg_info.py b/setuptools/command/install_egg_info.py
index fd0f118b..60b615d2 100755
--- a/setuptools/command/install_egg_info.py
+++ b/setuptools/command/install_egg_info.py
@@ -1,6 +1,8 @@
 from distutils import log, dir_util
 import os
 
+from setuptools.extern.six.moves import map
+
 from setuptools import Command
 from setuptools.archive_util import unpack_archive
 import pkg_resources
@@ -27,7 +29,7 @@ class install_egg_info(Command):
         ).egg_name() + '.egg-info'
         self.source = ei_cmd.egg_info
         self.target = os.path.join(self.install_dir, basename)
-        self.outputs = [self.target]
+        self.outputs = []
 
     def run(self):
         self.run_command('egg_info')