Anonymous committed d02172a

Fixed build_egg to test for the existence of the correct egg filename.

  • Participants
  • Parent commits 8dcf173
  • Branches 0.6-maintenance

Comments (0)

Files changed (1)

-def _build_egg(tarball, to_dir):
+def _build_egg(egg, tarball, to_dir):
     # extracting the tarball
     tmpdir = tempfile.mkdtemp()
     log.warn('Extracting in %s', tmpdir)
         _python_cmd('', '-q', 'bdist_egg', '--dist-dir', to_dir)
         # returning the result
-        for file in os.listdir(to_dir):
-            if fnmatch.fnmatch(file, 'distribute-%s*.egg' % DEFAULT_VERSION):
-                return os.path.join(to_dir, file)
-        raise IOError('Could not build the egg.')
+        if not os.path.exists(egg):
+            raise IOError('Could not build the egg.')
     if not os.path.exists(egg):
         tarball = download_setuptools(version, download_base,
                                       to_dir, download_delay)
-        egg = _build_egg(tarball, to_dir)
+        _build_egg(egg, tarball, to_dir)
     sys.path.insert(0, egg)
     import setuptools
     setuptools.bootstrap_install_from = egg