Jason R. Coombs avatar Jason R. Coombs committed cd1201f

Another attempt at a fix that uses setopt instead of hacking easy_install

Comments (0)

Files changed (1)

setuptools/command/easy_install.py

                     )
                 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):
                             '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:
                 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])
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.