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
792deebc
Commit
792deebc
authored
May 26, 2015
by
Kazuhiko Shiozaki
1
Browse files
Options
Browse Files
Download
Plain Diff
Release buildout-1.7.1.post9.
Merge branch 'always_use_build'
parents
76dc1b0b
83fc3a2d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
CHANGES.SlapOS.txt
CHANGES.SlapOS.txt
+5
-0
setup.py
setup.py
+1
-1
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+4
-0
No files found.
CHANGES.SlapOS.txt
View file @
792deebc
1.7.1.post9
-----------
- Always use build() in easy_install.py to install eggs.
1.7.1.post8
1.7.1.post8
-----------
-----------
...
...
setup.py
View file @
792deebc
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
#
#
##############################################################################
##############################################################################
name
=
"zc.buildout"
name
=
"zc.buildout"
version
=
"1.7.1.post
8
"
version
=
"1.7.1.post
9
"
import
os
import
os
from
setuptools
import
setup
from
setuptools
import
setup
...
...
src/zc/buildout/easy_install.py
View file @
792deebc
...
@@ -1049,6 +1049,8 @@ class Installer:
...
@@ -1049,6 +1049,8 @@ class Installer:
pkg_resources.Requirement.parse('setuptools')
pkg_resources.Requirement.parse('setuptools')
)
)
if ws.find(requirement) is None:
if ws.find(requirement) is None:
self._env.scan(
self.build(str(requirement), {}))
for dist in self._get_dist(requirement, ws, False):
for dist in self._get_dist(requirement, ws, False):
ws.add(dist)
ws.add(dist)
...
@@ -1129,6 +1131,8 @@ class Installer:
...
@@ -1129,6 +1131,8 @@ class Installer:
else:
else:
logger.debug('Adding required %r', str(req))
logger.debug('Adding required %r', str(req))
_log_requirement(ws, req)
_log_requirement(ws, req)
self._env.scan(
self.build(str(req), {}))
for dist in self._get_dist(req,
for dist in self._get_dist(req,
ws, self._always_unzip):
ws, self._always_unzip):
ws.add(dist)
ws.add(dist)
...
...
Kirill Smelkov
@kirr
mentioned in merge request
!1 (merged)
·
Jun 04, 2015
mentioned in merge request
!1 (merged)
mentioned in merge request !1
Toggle commit list
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