Permalink
Browse files

Merge branch 'develop' of github.com:pypa/virtualenv into develop

  • Loading branch information...
2 parents 52bc70b + c4eafdb commit b2144bba3b6e70657dcfe66c4040865f2b2c73f2 @jezdez jezdez committed Nov 21, 2012
Showing with 10 additions and 0 deletions.
  1. +10 −0 virtualenv.py
View
@@ -858,6 +858,16 @@ def main():
help='Use Distribute instead of Setuptools. Set environ variable '
'VIRTUALENV_DISTRIBUTE to make it the default ')
+ parser.add_option(
+ '--setuptools',
+ dest='use_distribute',
+ action='store_false',
+ help='Use Setuptools instead of Distribute. Set environ variable '
+ 'VIRTUALENV_SETUPTOOLS to make it the default ')
+
+ # Set this to True to use distribute by default, even in Python 2.
+ parser.set_defaults(use_distribute=False)
+
default_search_dirs = file_search_dirs()
parser.add_option(
'--extra-search-dir',

0 comments on commit b2144bb

Please sign in to comment.