Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.buildout
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
slapos.buildout
Commits
a8506de0
Commit
a8506de0
authored
Apr 16, 2010
by
Godefroid Chapelle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert changes moved to branch gotcha-scripts-warning
parent
b153d68b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
61 deletions
+2
-61
CHANGES.txt
CHANGES.txt
+1
-4
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+1
-15
zc.recipe.egg_/src/zc/recipe/egg/README.txt
zc.recipe.egg_/src/zc/recipe/egg/README.txt
+0
-42
No files found.
CHANGES.txt
View file @
a8506de0
...
...
@@ -6,11 +6,8 @@ Change History
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)
==================
...
...
src/zc/buildout/easy_install.py
View file @
a8506de0
...
...
@@ -940,10 +940,7 @@ def scripts(reqs, working_set, executable, dest,
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 @@ def scripts(reqs, working_set, executable, dest,
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 @@ def redo_pyc(egg):
subprocess
.
call
([
sys
.
executable
,
args
])
else
:
os
.
spawnv
(
os
.
P_WAIT
,
sys
.
executable
,
args
)
zc.recipe.egg_/src/zc/recipe/egg/README.txt
View file @
a8506de0
...
...
@@ -344,48 +344,6 @@ You can also control the name used for scripts:
- 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
-----------------------------
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment