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
2226a2ea
Commit
2226a2ea
authored
Oct 30, 2014
by
Alex Clark
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix Py3 regression
parent
4e26499a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
CHANGES.rst
CHANGES.rst
+6
-0
setup.py
setup.py
+1
-1
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+1
-1
No files found.
CHANGES.rst
View file @
2226a2ea
Change History
Change History
**************
**************
2.2.3 (2014-10-30)
==================
- Fix #197, Python 3 regression
[aclark4life]
2.2.2 (2014-10-30)
2.2.2 (2014-10-30)
==================
==================
...
...
setup.py
View file @
2226a2ea
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#
#
##############################################################################
##############################################################################
name
=
"zc.buildout"
name
=
"zc.buildout"
version
=
"2.2.
2
"
version
=
"2.2.
3
"
import
os
import
os
from
setuptools
import
setup
from
setuptools
import
setup
...
...
src/zc/buildout/easy_install.py
View file @
2226a2ea
...
@@ -653,7 +653,7 @@ class Installer:
...
@@ -653,7 +653,7 @@ class Installer:
if
dist
is
None
:
if
dist
is
None
:
try
:
try
:
dist
=
best
[
req
.
key
]
=
env
.
best_match
(
req
,
ws
)
dist
=
best
[
req
.
key
]
=
env
.
best_match
(
req
,
ws
)
except
pkg_resources
.
VersionConflict
,
err
:
except
pkg_resources
.
VersionConflict
as
err
:
raise
VersionConflict
(
err
,
ws
)
raise
VersionConflict
(
err
,
ws
)
if
dist
is
None
:
if
dist
is
None
:
if
dest
:
if
dest
:
...
...
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