From 2c6ea3818dd9e63527e7e04c6352adc672c86e04 Mon Sep 17 00:00:00 2001 From: PJ Eby Date: Tue, 14 Jun 2005 01:27:12 +0000 Subject: Cosmetic improvements to progress messages. --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041057 --- easy_install.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'easy_install.py') diff --git a/easy_install.py b/easy_install.py index 77205c19..24f33a59 100755 --- a/easy_install.py +++ b/easy_install.py @@ -143,14 +143,13 @@ class easy_install(Command): def easy_install(self, spec): tmpdir = self.alloc_tmp() try: - print "Downloading", spec download = self.package_index.download(spec, tmpdir) if download is None: raise RuntimeError( "Could not find distribution for %r" % spec ) - print "Installing", os.path.basename(download) + print "Processing", os.path.basename(download) for dist in self.install_eggs(download, self.zip_ok, tmpdir): self.package_index.add(dist) self.install_egg_scripts(dist) @@ -162,6 +161,7 @@ class easy_install(Command): + def install_egg_scripts(self, dist): metadata = dist.metadata if self.exclude_scripts or not metadata.metadata_isdir('scripts'): @@ -172,7 +172,7 @@ class easy_install(Command): for script_name in metadata.metadata_listdir('scripts'): target = os.path.join(self.script_dir, script_name) - print "Installing", script_name, "to", target + print "Installing", script_name, "script to", self.script_dir script_text = metadata.get_metadata('scripts/'+script_name) script_text = script_text.replace('\r','\n') @@ -226,10 +226,10 @@ class easy_install(Command): "Multiple setup scripts in %s" % dist_filename ) setup_script = setups[0] - from setuptools.command import bdist_egg sys.modules.setdefault('distutils.command.bdist_egg', bdist_egg) try: + print "Running", setup_script[len(tmpdir)+1:] run_setup(setup_script, ['-q', 'bdist_egg']) except SystemExit, v: raise RuntimeError( -- cgit v1.2.1