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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kirill Smelkov
slapos.buildout
Commits
057ee86b
Commit
057ee86b
authored
Sep 05, 2016
by
Reinout van Rees
Committed by
GitHub
Sep 05, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #310 from mauritsvanrees/issue-307-alternative
Do not remove an existing egg.
parents
5040cae3
ef12d418
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
86 additions
and
28 deletions
+86
-28
CHANGES.rst
CHANGES.rst
+14
-1
setup.py
setup.py
+1
-1
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+71
-26
No files found.
CHANGES.rst
View file @
057ee86b
Change
History
**************
2.
5.3
(
unreleased
)
2.
6.0
(
unreleased
)
==================
-
After
a
dist
is
fetched
and
put
into
its
final
place
,
compile
its
python
files
.
No
longer
wait
with
compiling
until
all
dists
are
in
place
.
This
is
related
to
the
change
below
about
not
removing
an
existing
egg
.
[
maurits
]
-
Do
not
remove
an
existing
egg
.
When
installing
an
egg
to
a
location
that
already
exists
,
keep
the
current
location
(
directory
or
file
).
This
can
only
happen
when
the
location
at
first
did
not
exist
and
this
changed
during
the
buildout
run
.
We
used
to
remove
the
previous
location
,
but
this
could
cause
problems
when
running
two
buildouts
at
the
same
time
,
when
they
try
to
install
the
same
new
egg
.
Fixes
#
307.
[
maurits
]
-
In
``
zc
.
buildout
.
testing
.
system
``,
set
``
TERM
=
dumb
``
in
the
environment
.
This
avoids
invisible
control
characters
popping
up
in
some
terminals
,
like
``
xterm
``.
Note
that
this
may
affect
tests
by
buildout
recipes
.
...
...
setup.py
View file @
057ee86b
...
...
@@ -12,7 +12,7 @@
#
##############################################################################
name
=
"zc.buildout"
version
=
'2.
5.3
.dev0'
version
=
'2.
6.0
.dev0'
import
os
from
setuptools
import
setup
...
...
src/zc/buildout/easy_install.py
View file @
057ee86b
...
...
@@ -397,16 +397,8 @@ class Installer:
result
=
[]
for
d
in
dists
:
newloc
=
os
.
path
.
join
(
dest
,
os
.
path
.
basename
(
d
.
location
))
if
os
.
path
.
exists
(
newloc
):
if
os
.
path
.
isdir
(
newloc
):
shutil
.
rmtree
(
newloc
)
else
:
os
.
remove
(
newloc
)
os
.
rename
(
d
.
location
,
newloc
)
newloc
=
_move_to_eggs_dir_and_compile
(
d
,
dest
)
[
d
]
=
pkg_resources
.
Environment
([
newloc
])[
d
.
project_name
]
result
.
append
(
d
)
return
result
...
...
@@ -526,19 +518,7 @@ class Installer:
if
dist
.
precedence
==
pkg_resources
.
EGG_DIST
:
# It's already an egg, just fetch it into the dest
newloc
=
os
.
path
.
join
(
self
.
_dest
,
os
.
path
.
basename
(
dist
.
location
))
if
os
.
path
.
isdir
(
dist
.
location
):
# we got a directory. It must have been
# obtained locally. Just copy it.
shutil
.
copytree
(
dist
.
location
,
newloc
)
else
:
setuptools
.
archive_util
.
unpack_archive
(
dist
.
location
,
newloc
)
redo_pyc
(
newloc
)
newloc
=
_move_to_eggs_dir_and_compile
(
dist
,
self
.
_dest
)
# Getting the dist from the environment causes the
# distribution meta data to be read. Cloning isn't
...
...
@@ -551,7 +531,6 @@ class Installer:
dists
=
self
.
_call_easy_install
(
dist
.
location
,
ws
,
self
.
_dest
,
dist
)
for
dist
in
dists
:
redo_pyc
(
dist
.
location
)
if
for_buildout_run
:
# ws is the global working set and we're
# installing buildout, setuptools, extensions or
...
...
@@ -792,9 +771,6 @@ class Installer:
base
,
pkg_resources
.
WorkingSet
(),
self
.
_dest
,
dist
)
for
dist
in
dists
:
redo_pyc
(
dist
.
location
)
return
[
dist
.
location
for
dist
in
dists
]
finally
:
shutil
.
rmtree
(
build_tmp
)
...
...
@@ -1564,3 +1540,72 @@ class IncompatibleConstraintError(zc.buildout.UserError):
"""
IncompatibleVersionError
=
IncompatibleConstraintError
# Backward compatibility
def
_move_to_eggs_dir_and_compile
(
dist
,
dest
):
"""Move distribution to the eggs destination directory.
And compile the py files, if we have actually moved the dist.
Its new location is expected not to exist there yet, otherwise we
would not be calling this function: the egg is already there. But
the new location might exist at this point if another buildout is
running in parallel. So we copy to a temporary directory first.
See discussion at https://github.com/buildout/buildout/issues/307
We return the new location.
"""
# First make sure the destination directory exists. This could suffer from
# the same kind of race condition as the rest: if we check that it does not
# exist, and we then create it, it will fail when a second buildout is
# doing the same thing.
try
:
os
.
makedirs
(
dest
)
except
OSError
:
if
not
os
.
path
.
isdir
(
dest
):
# Unknown reason. Reraise original error.
raise
newloc
=
os
.
path
.
join
(
dest
,
os
.
path
.
basename
(
dist
.
location
))
tmp_dest
=
tempfile
.
mkdtemp
(
dir
=
dest
)
try
:
tmp_egg_dir
=
os
.
path
.
join
(
tmp_dest
,
os
.
path
.
basename
(
dist
.
location
))
if
os
.
path
.
isdir
(
dist
.
location
):
# We got a directory. It must have been obtained locally.
# Just copy it.
shutil
.
copytree
(
dist
.
location
,
tmp_egg_dir
)
else
:
# It is a zipped egg. Buildout 2 no longer installs zipped eggs,
# so we always want to unpack it.
setuptools
.
archive_util
.
unpack_archive
(
dist
.
location
,
tmp_egg_dir
)
# We have copied the egg. Now try to rename/move it.
try
:
os
.
rename
(
tmp_egg_dir
,
newloc
)
except
OSError
:
# Might be for various reasons. If it is because newloc already
# exists, we can investigate.
if
not
os
.
path
.
exists
(
newloc
):
# No, it is a different reason. Give up.
raise
# Try to use it as environment and check if our project is in it.
if
not
pkg_resources
.
Environment
([
newloc
])[
dist
.
project_name
]:
# Path exists, but is not our package. We could
# try something, but it seems safer to bail out
# with the original error.
raise
# newloc looks okay to use. Do print a warning.
logger
.
warn
(
"Path %s unexpectedly already exists.
\
n
"
"Maybe a buildout running in parallel has added it. "
"We will accept it.
\
n
"
"If this contains a wrong package, please remove it yourself."
,
newloc
)
else
:
# There were no problems during the rename.
# Do the compile step.
redo_pyc
(
newloc
)
finally
:
# Remember that temporary directories must be removed
shutil
.
rmtree
(
tmp_dest
)
return
newloc
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