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
a2552b7e
Commit
a2552b7e
authored
Jul 19, 2008
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Be more careful about which py files we recompile.
parent
79ef8441
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+4
-3
No files found.
src/zc/buildout/easy_install.py
View file @
a2552b7e
...
@@ -504,6 +504,8 @@ class Installer:
...
@@ -504,6 +504,8 @@ class Installer:
else
:
else
:
shutil
.
copyfile
(
dist
.
location
,
newloc
)
shutil
.
copyfile
(
dist
.
location
,
newloc
)
redo_pyc
(
newloc
)
# Getting the dist from the environment causes the
# Getting the dist from the environment causes the
# distribution meta data to be read. Cloning isn't
# distribution meta data to be read. Cloning isn't
# good enough.
# good enough.
...
@@ -516,6 +518,8 @@ class Installer:
...
@@ -516,6 +518,8 @@ class Installer:
# deal with it:
# deal with it:
dists
=
self
.
_call_easy_install
(
dists
=
self
.
_call_easy_install
(
dist
.
location
,
ws
,
self
.
_dest
,
dist
)
dist
.
location
,
ws
,
self
.
_dest
,
dist
)
for
dist
in
dists
:
redo_pyc
(
dist
.
location
)
finally
:
finally
:
if
tmp
!=
self
.
_download_cache
:
if
tmp
!=
self
.
_download_cache
:
...
@@ -579,7 +583,6 @@ class Installer:
...
@@ -579,7 +583,6 @@ class Installer:
if
ws
.
find
(
requirement
)
is
None
:
if
ws
.
find
(
requirement
)
is
None
:
for
dist
in
self
.
_get_dist
(
requirement
,
ws
,
False
):
for
dist
in
self
.
_get_dist
(
requirement
,
ws
,
False
):
ws
.
add
(
dist
)
ws
.
add
(
dist
)
redo_pyc
(
dist
.
location
)
def
_constrain
(
self
,
requirement
):
def
_constrain
(
self
,
requirement
):
...
@@ -617,7 +620,6 @@ class Installer:
...
@@ -617,7 +620,6 @@ class Installer:
for
requirement
in
requirements
:
for
requirement
in
requirements
:
for
dist
in
self
.
_get_dist
(
requirement
,
ws
,
self
.
_always_unzip
):
for
dist
in
self
.
_get_dist
(
requirement
,
ws
,
self
.
_always_unzip
):
ws
.
add
(
dist
)
ws
.
add
(
dist
)
redo_pyc
(
dist
.
location
)
self
.
_maybe_add_setuptools
(
ws
,
dist
)
self
.
_maybe_add_setuptools
(
ws
,
dist
)
# OK, we have the requested distributions and they're in the working
# OK, we have the requested distributions and they're in the working
...
@@ -644,7 +646,6 @@ class Installer:
...
@@ -644,7 +646,6 @@ class Installer:
):
):
ws
.
add
(
dist
)
ws
.
add
(
dist
)
redo_pyc
(
dist
.
location
)
self
.
_maybe_add_setuptools
(
ws
,
dist
)
self
.
_maybe_add_setuptools
(
ws
,
dist
)
except
pkg_resources
.
VersionConflict
,
err
:
except
pkg_resources
.
VersionConflict
,
err
:
raise
VersionConflict
(
err
,
ws
)
raise
VersionConflict
(
err
,
ws
)
...
...
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