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
7
Merge Requests
7
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
8f227667
Commit
8f227667
authored
Oct 31, 2014
by
Reinout van Rees
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved the log statement around, it was too verbose in the previous location
parent
cc9d4195
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+4
-2
No files found.
src/zc/buildout/easy_install.py
View file @
8f227667
...
@@ -647,13 +647,15 @@ class Installer:
...
@@ -647,13 +647,15 @@ class Installer:
if
req
in
processed
:
if
req
in
processed
:
# Ignore cyclic or redundant dependencies.
# Ignore cyclic or redundant dependencies.
continue
continue
logger
.
debug
(
"Processing requirement %s (constrained to %s)"
,
current_requirement
,
req
)
dist
=
best
.
get
(
req
.
key
)
dist
=
best
.
get
(
req
.
key
)
if
dist
is
None
:
if
dist
is
None
:
try
:
try
:
dist
=
env
.
best_match
(
req
,
ws
)
dist
=
env
.
best_match
(
req
,
ws
)
except
pkg_resources
.
VersionConflict
as
err
:
except
pkg_resources
.
VersionConflict
as
err
:
logger
.
debug
(
"Version conflict while processing requirement %s "
"(constrained to %s)"
,
current_requirement
,
req
)
if
req
.
key
in
[
'zc.buildout'
,
'setuptools'
]:
if
req
.
key
in
[
'zc.buildout'
,
'setuptools'
]:
# We're bootstrapping zc.buildout with a different
# We're bootstrapping zc.buildout with a different
# version than the one we specified in our versions
# version than the one we specified in our versions
...
...
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