[Checkins] SVN: grokproject/branches/ulif-zopectl-less/grokproject/ Remove mentions of zopectl. Use renamed extra-egg config.

[Uli Fouquet]

Log message for revision 109855:
  Remove mentions of zopectl. Use renamed extra-egg config.

Changed:
  U   grokproject/branches/ulif-zopectl-less/grokproject/main.py
  U   grokproject/branches/ulif-zopectl-less/grokproject/templates.py
  U   grokproject/branches/ulif-zopectl-less/grokproject/utils.py

-=-
Modified: grokproject/branches/ulif-zopectl-less/grokproject/main.py
===================================================================
--- grokproject/branches/ulif-zopectl-less/grokproject/main.py	2010-03-08 22:46:19 UTC (rev 109854)
+++ grokproject/branches/ulif-zopectl-less/grokproject/main.py	2010-03-08 22:47:17 UTC (rev 109855)
@@ -20,8 +20,6 @@
                       "the latest version found on the grok website is used.")
     parser.add_option('-v', '--verbose', action="store_true", dest="verbose",
                       default=False, help="Be verbose.")
-    parser.add_option('--zopectl', action="store_true", dest="zopectl",
-                      default=False, help="Use zopectl.")
     parser.add_option('--version', action="store_true", dest="version",
                       default=False, help="Show grokproject version.")
     
@@ -62,8 +60,6 @@
         supplied_value = getattr(options, var.name)
         if supplied_value is not None:
             extra_args.append('%s=%s' % (var.name, supplied_value))
-    if options.zopectl:
-        extra_args.append('zopectl=True')
     if options.grokversion:
         extra_args.append('grokversion=%s' % options.grokversion)
 

Modified: grokproject/branches/ulif-zopectl-less/grokproject/templates.py
===================================================================
--- grokproject/branches/ulif-zopectl-less/grokproject/templates.py	2010-03-08 22:46:19 UTC (rev 109854)
+++ grokproject/branches/ulif-zopectl-less/grokproject/templates.py	2010-03-08 22:47:17 UTC (rev 109855)
@@ -75,12 +75,6 @@
             vars[var_name] = xml.sax.saxutils.quoteattr(vars[var_name])
         vars['app_class_name'] = vars['project'].capitalize()
 
-        create_zopectl = False
-        if vars.get('zopectl','') == 'True':
-            create_zopectl = True
-        if create_zopectl:
-            self._template_dir = 'template_zopectl'
-
         # Handling the version.cfg file.
         print "Downloading info about versions..."
         version = vars.get('grokversion', 'current')
@@ -97,7 +91,7 @@
 
         # Maybe add additional eggs...
         vars['version_info_additions'] = extend_versions_cfg(
-            vars['version_info_file_contents'], create_zopectl)
+            vars['version_info_file_contents'])
 
         # Which grok version are we depending on?
         version = required_grok_version(vars['version_info_file_contents'])

Modified: grokproject/branches/ulif-zopectl-less/grokproject/utils.py
===================================================================
--- grokproject/branches/ulif-zopectl-less/grokproject/utils.py	2010-03-08 22:46:19 UTC (rev 109854)
+++ grokproject/branches/ulif-zopectl-less/grokproject/utils.py	2010-03-08 22:47:17 UTC (rev 109855)
@@ -174,19 +174,15 @@
             return line.split(' ')[-1]
 
 
-def extend_versions_cfg(versions_cfg, for_zopectl=False):
+def extend_versions_cfg(versions_cfg):
     """Add additional package versions for versions.cfg.
     
     We only add eggs that are not already included in versions.cfg
     fetched from the release info URL (usually grok.zope.org/releaseinfo).
     """
     here = os.path.dirname(__file__)
-    if for_zopectl:
-        additional_eggs = open(
-            os.path.join(here, 'ext_eggs_zctl.cfg'), 'rb').read()
-    else:
-        additional_eggs = open(
-            os.path.join(here, 'ext_eggs_paster.cfg'), 'rb').read()
+    additional_eggs = open(
+        os.path.join(here, 'ext_eggs.cfg'), 'rb').read()
         
     # Create a list of already pinned eggs...
     pinned = list()