[Checkins] SVN: grokproject/trunk/grokproject/templates.py When the user specifies an eggs_dir on the command line, even though he has a default.cfg, do use that specific eggs dir.

[Maurits van Rees]

Log message for revision 86139:
  When the user specifies an eggs_dir on the command line, even though he has a default.cfg, do use that specific eggs dir.

Changed:
  U   grokproject/trunk/grokproject/templates.py

-=-
Modified: grokproject/trunk/grokproject/templates.py
===================================================================
--- grokproject/trunk/grokproject/templates.py	2008-05-02 21:48:16 UTC (rev 86138)
+++ grokproject/trunk/grokproject/templates.py	2008-05-02 21:48:53 UTC (rev 86139)
@@ -46,6 +46,7 @@
             print "Please choose a different project name."
             sys.exit(1)
 
+        explicit_eggs_dir = vars.get('eggs_dir')
         # Do not ask for eggs dir when we have a default already.
         buildout_default = get_buildout_default_eggs_dir()
         if buildout_default is not None:
@@ -74,7 +75,10 @@
         version_info_file_contents = urllib.urlopen(version_info_url).read()
         vars['version_info_file_contents'] = version_info_file_contents
 
-        vars['eggs_dir'] = os.path.expanduser(vars['eggs_dir'])
+        if explicit_eggs_dir is None:
+            vars['eggs_dir'] = os.path.expanduser(vars['eggs_dir'])
+        else:
+            vars['eggs_dir'] = os.path.expanduser(explicit_eggs_dir)
         if buildout_default is None:
             create_buildout_defaults_file(vars['eggs_dir'])
         buildout_default = get_buildout_default_eggs_dir()