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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
slapos.buildout
Commits
9f326a4f
Commit
9f326a4f
authored
Jun 29, 2017
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zc.recipe.egg: make 'interpreter' usable even when 'scripts' value is empty
parent
7a5dd160
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
zc.recipe.egg_/src/zc/recipe/egg/egg.py
zc.recipe.egg_/src/zc/recipe/egg/egg.py
+6
-7
No files found.
zc.recipe.egg_/src/zc/recipe/egg/egg.py
View file @
9f326a4f
...
@@ -161,13 +161,12 @@ class Scripts(Eggs):
...
@@ -161,13 +161,12 @@ class Scripts(Eggs):
options
=
self
.
options
options
=
self
.
options
scripts
=
options
.
get
(
'scripts'
)
scripts
=
options
.
get
(
'scripts'
)
if
scripts
or
scripts
is
None
:
interpreter
=
options
.
get
(
'interpreter'
)
if
scripts
!=
''
or
interpreter
:
if
scripts
is
not
None
:
if
scripts
is
not
None
:
scripts
=
scripts
.
split
()
scripts
=
dict
(
scripts
=
dict
([
s
.
split
(
'='
,
1
)
if
'='
in
s
else
(
s
,
s
)
(
'='
in
s
)
and
s
.
split
(
'='
,
1
)
or
(
s
,
s
)
for
s
in
scripts
.
split
())
for
s
in
scripts
])
for
s
in
options
.
get
(
'entry-points'
,
''
).
split
():
for
s
in
options
.
get
(
'entry-points'
,
''
).
split
():
parsed
=
self
.
parse_entry_point
(
s
)
parsed
=
self
.
parse_entry_point
(
s
)
...
@@ -190,7 +189,7 @@ class Scripts(Eggs):
...
@@ -190,7 +189,7 @@ class Scripts(Eggs):
reqs
,
ws
,
sys
.
executable
,
options
[
'bin-directory'
],
reqs
,
ws
,
sys
.
executable
,
options
[
'bin-directory'
],
scripts
=
scripts
,
scripts
=
scripts
,
extra_paths
=
self
.
extra_paths
,
extra_paths
=
self
.
extra_paths
,
interpreter
=
options
.
get
(
'interpreter'
)
,
interpreter
=
interpreter
,
initialization
=
options
.
get
(
'initialization'
,
''
),
initialization
=
options
.
get
(
'initialization'
,
''
),
arguments
=
options
.
get
(
'arguments'
,
''
),
arguments
=
options
.
get
(
'arguments'
,
''
),
relative_paths
=
self
.
_relative_paths
,
relative_paths
=
self
.
_relative_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