diff options
| author | PJ Eby <distutils-sig@python.org> | 2005-07-10 05:06:31 +0000 |
|---|---|---|
| committer | PJ Eby <distutils-sig@python.org> | 2005-07-10 05:06:31 +0000 |
| commit | ebe75f51d4e7be105729ac7555b97a17115aa570 (patch) | |
| tree | fd62d7bafb3e65860b01a84d30211b2129a151f3 /setuptools/command | |
| parent | 451377d0e877fc610d1bdf8181ba70a90e4c14cc (diff) | |
| download | external_python_setuptools-ebe75f51d4e7be105729ac7555b97a17115aa570.tar.gz external_python_setuptools-ebe75f51d4e7be105729ac7555b97a17115aa570.tar.bz2 external_python_setuptools-ebe75f51d4e7be105729ac7555b97a17115aa570.zip | |
Allow EasyInstall to accept a directory containing a setup script as one
of its arguments. Fix swapped short option names for --bdist-dir and
--dist-dir in bdist_egg.
--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041110
Diffstat (limited to 'setuptools/command')
| -rw-r--r-- | setuptools/command/bdist_egg.py | 4 | ||||
| -rwxr-xr-x | setuptools/command/easy_install.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/command/bdist_egg.py b/setuptools/command/bdist_egg.py index 552bd7e8..21dcc464 100644 --- a/setuptools/command/bdist_egg.py +++ b/setuptools/command/bdist_egg.py @@ -44,7 +44,7 @@ class bdist_egg(Command): description = "create an \"egg\" distribution" user_options = [ - ('bdist-dir=', 'd', + ('bdist-dir=', 'b', "temporary directory for creating the distribution"), ('plat-name=', 'p', "platform name to embed in generated filenames " @@ -54,7 +54,7 @@ class bdist_egg(Command): ('keep-temp', 'k', "keep the pseudo-installation tree around after " + "creating the distribution archive"), - ('dist-dir=', 'b', + ('dist-dir=', 'd', "directory to put final built distributions in"), ('skip-build', None, "skip rebuilding everything (for testing/debugging)"), diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 4ac6bac7..aeb8075a 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -419,6 +419,8 @@ class easy_install(Command): # Anything else, try to extract and build if os.path.isfile(dist_filename): unpack_archive(dist_filename, tmpdir, self.unpack_progress) + elif os.path.isdir(dist_filename): + tmpdir = dist_filename # ugh # Find the setup.py file from glob import glob @@ -436,7 +438,7 @@ class easy_install(Command): setup_script = setups[0] self.build_egg(tmpdir, setup_script) - dist_dir = os.path.join(os.path.dirname(setup_script),'dist') + dist_dir = os.path.join(os.path.dirname(setup_script),'dist') # XXX eggs = [] for egg in glob(os.path.join(dist_dir,'*.egg')): @@ -447,8 +449,6 @@ class easy_install(Command): return eggs - - def egg_distribution(self, egg_path): if os.path.isdir(egg_path): metadata = PathMetadata(egg_path,os.path.join(egg_path,'EGG-INFO')) |