diff options
| author | PJ Eby <distutils-sig@python.org> | 2005-07-04 18:45:41 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2005-07-04 18:45:41 +0000 |
| commit | 52928dfe183fcd7e7e5684914522b1da47938ae1 (patch) | |
| tree | a75dee0e688d2c912cf8231d749bdcf29eafc73e | |
| parent | 8a4d2f4e3f1c64141cf94f1ca697cdc2c63ec0c6 (diff) | |
| download | external_python_setuptools-52928dfe183fcd7e7e5684914522b1da47938ae1.tar.gz external_python_setuptools-52928dfe183fcd7e7e5684914522b1da47938ae1.tar.bz2 external_python_setuptools-52928dfe183fcd7e7e5684914522b1da47938ae1.zip | |
Fix a problem using bdist_egg with non-setuptools distributions.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041076
| -rw-r--r-- | setuptools/command/bdist_egg.py | 10 | ||||
| -rw-r--r-- | setuptools/dist.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index 8abcb855..b21ef741 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -201,9 +201,8 @@ class bdist_egg(Command): self.call_command('install_scripts', install_dir=script_dir) self.write_requirements() - - 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 @@ -233,9 +232,7 @@ class bdist_egg(Command): if os.path.exists(os.path.join(self.egg_info,'depends.txt')): log.warn( - "WARNING: 'depends.txt' will not be used by setuptools 0.6!" - ) - log.warn( + "WARNING: 'depends.txt' will not be used by setuptools 0.6!\n" "Use the install_requires/extras_require setup() args instead." ) # Make the archive @@ -244,6 +241,9 @@ class bdist_egg(Command): if not self.keep_temp: remove_tree(self.bdist_dir, dry_run=self.dry_run) + getattr(self.distribution,'dist_files',[]).append( + ('bdist_egg',get_python_version(),self.egg_output)) + def tagged_version(self): version = self.distribution.get_version() if self.tag_build: diff --git a/setuptools/dist.py b/setuptools/dist.py index 742ce7a1..ebcc12f9 100644 --- a/setuptools/dist.py +++ b/setuptools/dist.py @@ -89,6 +89,7 @@ class Distribution(_Distribution): self.requires = [] self.install_requires = [] self.extras_require = {} + self.dist_files = [] _Distribution.__init__(self,attrs) if not have_package_data: from setuptools.command.build_py import build_py @@ -120,7 +121,6 @@ class Distribution(_Distribution): - def finalize_options(self): _Distribution.finalize_options(self) |