diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-03-06 10:29:44 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-03-06 10:29:44 -0500 |
commit | 65f1b9b492d38e014be35489ffda591ce40552db (patch) | |
tree | 4c7f5c05d3d2e97ebe8a795c24fe6a0e19a8901f /ez_setup.py | |
parent | 4a641d6b17ca46fd04d3d5f75c80809bf32ad75d (diff) | |
download | external_python_setuptools-65f1b9b492d38e014be35489ffda591ce40552db.tar.gz external_python_setuptools-65f1b9b492d38e014be35489ffda591ce40552db.tar.bz2 external_python_setuptools-65f1b9b492d38e014be35489ffda591ce40552db.zip |
Allow version to be passed to ez_setup.py. The parameter to main wasn't being used, so removed it.
--HG--
extra : amend_source : 2a653d81b4afea7d91c9e58a537317dd24673ee0
Diffstat (limited to 'ez_setup.py')
-rw-r--r-- | ez_setup.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ez_setup.py b/ez_setup.py index 68ca77ac..97d60e76 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -310,15 +310,22 @@ def _parse_args(): const=lambda: download_file_insecure, default=get_best_downloader, help='Use internal, non-validating downloader' ) + parser.add_option( + '--version', help="Specify which version to download", + default=DEFAULT_VERSION, + ) options, args = parser.parse_args() # positional arguments are ignored return options -def main(version=DEFAULT_VERSION): +def main(): """Install or upgrade setuptools and EasyInstall""" options = _parse_args() - archive = download_setuptools(download_base=options.download_base, - downloader_factory=options.downloader_factory) + archive = download_setuptools( + version=options.version, + download_base=options.download_base, + downloader_factory=options.downloader_factory, + ) return _install(archive, _build_install_args(options)) if __name__ == '__main__': |