[Checkins] SVN: zc.buildout/trunk/ revert changes moved to branch gotcha-scripts-warning

[Godefroid Chapelle]

Log message for revision 110961:
  revert changes moved to branch gotcha-scripts-warning
  

Changed:
  U   zc.buildout/trunk/CHANGES.txt
  U   zc.buildout/trunk/src/zc/buildout/easy_install.py
  U   zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt

-=-
Modified: zc.buildout/trunk/CHANGES.txt
===================================================================
--- zc.buildout/trunk/CHANGES.txt	2010-04-16 09:41:48 UTC (rev 110960)
+++ zc.buildout/trunk/CHANGES.txt	2010-04-16 09:45:10 UTC (rev 110961)
@@ -6,11 +6,8 @@
 
 New feature:
 
-- Warn when a script name passed in 'scripts' argument of easy_install.scripts
-  is not defined in an entry point.
-
 - Added buildout:socket-timout option so that socket timeout can be configured
-  both from command line and from config files.
+  both from command line and from config files. (gotcha)
 
 1.4.3 (2009-12-10)
 ==================

Modified: zc.buildout/trunk/src/zc/buildout/easy_install.py
===================================================================
--- zc.buildout/trunk/src/zc/buildout/easy_install.py	2010-04-16 09:41:48 UTC (rev 110960)
+++ zc.buildout/trunk/src/zc/buildout/easy_install.py	2010-04-16 09:45:10 UTC (rev 110961)
@@ -940,10 +940,7 @@
         else:
             entry_points.append(req)
 
-    entry_points_names = []
-
     for name, module_name, attrs in entry_points:
-        entry_points_names.append(name)
         if scripts is not None:
             sname = scripts.get(name)
             if sname is None:
@@ -959,18 +956,6 @@
                     initialization, rpsetup)
             )
 
-    # warn when a script name passed in 'scripts' argument
-    # is not defined in an entry point.
-    if scripts is not None:
-        for name, target in scripts.items():
-            if name not in entry_points_names:
-                if name == target:
-                    logger.warning("Could not generate script '%s' as it is not "
-                        "defined in the egg entry points.", name)
-                else:
-                    logger.warning("Could not generate script '%s' as script "
-                        "'%s' is not defined in the egg entry points.", name, target)
-
     if interpreter:
         sname = os.path.join(dest, interpreter)
         spath, rpsetup = _relative_path_and_setup(sname, path, relative_paths)
@@ -1267,3 +1252,4 @@
                     subprocess.call([sys.executable, args])
                 else:
                     os.spawnv(os.P_WAIT, sys.executable, args)
+

Modified: zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt
===================================================================
--- zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2010-04-16 09:41:48 UTC (rev 110960)
+++ zc.buildout/trunk/zc.recipe.egg_/src/zc/recipe/egg/README.txt	2010-04-16 09:45:10 UTC (rev 110961)
@@ -344,48 +344,6 @@
     -  buildout
     -  foo
 
-If a wrong script name is provided, buildout tells about it:
-
-    >>> write(sample_buildout, 'buildout.cfg',
-    ... """
-    ... [buildout]
-    ... parts = demo
-    ...
-    ... [demo]
-    ... recipe = zc.recipe.egg
-    ... find-links = %(server)s
-    ... index = %(server)s/index
-    ... scripts = undefined
-    ... """ % dict(server=link_server))
-
-    >>> print system(buildout),
-    Uninstalling demo.
-    Installing demo.
-    Could not generate script 'undefined' as it is not defined in the egg entry points.
-
-    >>> ls(sample_buildout, 'bin')
-    -  buildout
-
-    >>> write(sample_buildout, 'buildout.cfg',
-    ... """
-    ... [buildout]
-    ... parts = demo
-    ...
-    ... [demo]
-    ... recipe = zc.recipe.egg
-    ... find-links = %(server)s
-    ... index = %(server)s/index
-    ... scripts = foo=undefined
-    ... """ % dict(server=link_server))
-
-    >>> print system(buildout),
-    Uninstalling demo.
-    Installing demo.
-    Could not generate script 'foo' as script 'undefined' is not defined in the egg entry points.
-
-    >>> ls(sample_buildout, 'bin')
-    -  buildout
-
 Specifying extra script paths
 -----------------------------