diff options
| -rwxr-xr-x | setuptools/command/easy_install.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index d200dac1..ef82808b 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -271,8 +271,7 @@ class easy_install(Command): ) else: self.all_site_dirs.append(normalize_path(d)) - if not self.editable and self.args != ['-']: - self.check_site_dir() + if not self.editable: self.check_site_dir() self.index_url = self.index_url or "http://pypi.python.org/simple" self.shadow_path = self.all_site_dirs[:] for path_item in self.install_dir, normalize_path(self.script_dir): @@ -343,11 +342,6 @@ class easy_install(Command): 'install_scripts', 'install_data',]) def run(self): - if self.args == ['-']: - # A single dash as an argument means 'do nothing' and is just a way - # to pass arguments to the easy_install command without running it - return - if self.verbose != self.distribution.verbose: log.set_verbosity(self.verbose) try: @@ -1102,10 +1096,14 @@ See the setuptools documentation for the "develop" command for more info. if key not in keep: del ei_opts[key] if ei_opts: - args.append('easy_install') for key, val in ei_opts.iteritems(): - args.append('--%s=%s' % (key.replace('_', '-'), val[1])) - args.append('-') + args.append('setopt') + args.append('--command') + args.append('easy_install') + args.append('--option') + args.append(key.replace('_', '-')) + args.append('--set-value') + args.append(val[1]) self.run_setup(setup_script, setup_base, args) all_eggs = Environment([dist_dir]) |