Commit a8506de0 authored by Godefroid Chapelle's avatar Godefroid Chapelle

revert changes moved to branch gotcha-scripts-warning

parent b153d68b
...@@ -6,11 +6,8 @@ Change History ...@@ -6,11 +6,8 @@ Change History
New feature: 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 - 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) 1.4.3 (2009-12-10)
================== ==================
......
...@@ -940,10 +940,7 @@ def scripts(reqs, working_set, executable, dest, ...@@ -940,10 +940,7 @@ def scripts(reqs, working_set, executable, dest,
else: else:
entry_points.append(req) entry_points.append(req)
entry_points_names = []
for name, module_name, attrs in entry_points: for name, module_name, attrs in entry_points:
entry_points_names.append(name)
if scripts is not None: if scripts is not None:
sname = scripts.get(name) sname = scripts.get(name)
if sname is None: if sname is None:
...@@ -959,18 +956,6 @@ def scripts(reqs, working_set, executable, dest, ...@@ -959,18 +956,6 @@ def scripts(reqs, working_set, executable, dest,
initialization, rpsetup) 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: if interpreter:
sname = os.path.join(dest, interpreter) sname = os.path.join(dest, interpreter)
spath, rpsetup = _relative_path_and_setup(sname, path, relative_paths) spath, rpsetup = _relative_path_and_setup(sname, path, relative_paths)
...@@ -1267,3 +1252,4 @@ def redo_pyc(egg): ...@@ -1267,3 +1252,4 @@ def redo_pyc(egg):
subprocess.call([sys.executable, args]) subprocess.call([sys.executable, args])
else: else:
os.spawnv(os.P_WAIT, sys.executable, args) os.spawnv(os.P_WAIT, sys.executable, args)
...@@ -344,48 +344,6 @@ You can also control the name used for scripts: ...@@ -344,48 +344,6 @@ You can also control the name used for scripts:
- buildout - buildout
- foo - 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 Specifying extra script paths
----------------------------- -----------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment