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
Thomas Leymonerie
slapos.buildout
Commits
dfc63b18
Commit
dfc63b18
authored
Nov 24, 2014
by
Reinout van Rees
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for #212
parent
f7018cc4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+10
-7
No files found.
src/zc/buildout/easy_install.py
View file @
dfc63b18
...
...
@@ -1346,13 +1346,16 @@ class VersionConflict(zc.buildout.UserError):
self
.
err
,
self
.
ws
=
err
,
ws
def
__str__
(
self
):
existing_dist
,
req
=
self
.
err
.
args
result
=
[
"There is a version conflict."
,
"We already have: %s"
%
existing_dist
,
]
for
dist
in
self
.
ws
:
if
req
in
dist
.
requires
():
result
.
append
(
"but %s requires %r."
%
(
dist
,
str
(
req
)))
result
=
[
"There is a version conflict."
]
if
len
(
self
.
err
.
args
)
==
2
:
existing_dist
,
req
=
self
.
err
.
args
result
.
append
(
"We already have: %s"
%
existing_dist
)
for
dist
in
self
.
ws
:
if
req
in
dist
.
requires
():
result
.
append
(
"but %s requires %r."
%
(
dist
,
str
(
req
)))
else
:
# The error argument is already a nice error string.
result
.
append
(
self
.
err
.
args
[
0
])
return
'
\
n
'
.
join
(
result
)
...
...
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