[Python-checkins] python/nondist/sandbox/setuptools/setuptools/command bdist_egg.py, 1.11, 1.12

pje@users.sourceforge.net pje at users.sourceforge.net
Tue May 31 01:22:12 CEST 2005


Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9371/setuptools/command

Modified Files:
	bdist_egg.py 
Log Message:
Ensure that the distribution name written to PKG-INFO is the same as the
name you'll use in 'require()' operations for that distribution.


Index: bdist_egg.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/command/bdist_egg.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- bdist_egg.py	30 May 2005 06:46:01 -0000	1.11
+++ bdist_egg.py	30 May 2005 23:22:10 -0000	1.12
@@ -174,15 +174,15 @@
         egg_info = os.path.join(archive_root,'EGG-INFO')
         self.mkpath(egg_info)
         self.mkpath(self.egg_info)
-
         log.info("writing %s" % os.path.join(self.egg_info,'PKG-INFO'))
         if not self.dry_run:
             metadata = self.distribution.metadata
             metadata.version, oldver = self.egg_version, metadata.version
+            metadata.name, oldname   = self.egg_name, metadata.name
             try:
                 metadata.write_pkg_info(self.egg_info)
             finally:
-                metadata.version = oldver
+                metadata.name, metadata.version = oldname, oldver
 
         native_libs = os.path.join(self.egg_info,"native_libs.txt")
         if ext_outputs:



More information about the Python-checkins mailing list