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
Łukasz Nowak
slapos.buildout
Commits
a29d5c43
Commit
a29d5c43
authored
Jan 13, 2008
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Made realpath more robust and added some missing and removed some
extra uses.
parent
92756060
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
10 deletions
+6
-10
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+6
-10
No files found.
src/zc/buildout/easy_install.py
View file @
a29d5c43
...
...
@@ -28,13 +28,9 @@ import setuptools.package_index
import
setuptools.archive_util
import
zc.buildout
_oprp
=
getattr
(
os
.
path
,
'realpath'
,
lambda
path
:
path
)
def
realpath
(
path
):
return
path
try
:
realpath
=
os
.
path
.
realpath
except
AttributeError
:
pass
return
os
.
path
.
normcase
(
os
.
path
.
abspath
(
_oprp
(
path
)))
default_index_url
=
os
.
environ
.
get
(
'buildout-testing-index-url'
,
...
...
@@ -397,7 +393,7 @@ class Installer:
for
dist
in
best
:
if
(
realpath
(
os
.
path
.
dirname
(
dist
.
location
))
==
realpath
(
self
.
_download_cache
)
self
.
_download_cache
):
return
dist
...
...
@@ -406,13 +402,13 @@ class Installer:
def
_fetch
(
self
,
dist
,
tmp
,
download_cache
):
if
(
download_cache
and
(
os
.
path
.
dirname
(
dist
.
location
)
==
download_cache
)
and
(
realpath
(
os
.
path
.
dirname
(
dist
.
location
)
)
==
download_cache
)
):
return
dist
new_location
=
self
.
_index
.
download
(
dist
.
location
,
tmp
)
if
(
download_cache
and
(
new_location
==
dist
.
location
)
and
(
realpath
(
new_location
)
==
realpath
(
dist
.
location
)
)
and
os
.
path
.
isfile
(
new_location
)
):
# setuptools avoids making extra copies, but we want to copy
...
...
@@ -701,7 +697,7 @@ def download_cache(path=-1):
old
=
Installer
.
_download_cache
if
path
!=
-
1
:
if
path
:
path
=
os
.
path
.
abs
path
(
path
)
path
=
real
path
(
path
)
Installer
.
_download_cache
=
path
return
old
...
...
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