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
77a3db7d
Commit
77a3db7d
authored
Jul 15, 2010
by
Gary Poster
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix Py 2.6-specific test failure
parent
5acc5256
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
src/zc/buildout/easy_install.py
src/zc/buildout/easy_install.py
+3
-3
No files found.
src/zc/buildout/easy_install.py
View file @
77a3db7d
...
@@ -259,7 +259,7 @@ else:
...
@@ -259,7 +259,7 @@ else:
# for another description of the problem). Simply starting Python with
# for another description of the problem). Simply starting Python with
# -S addresses the problem in Python 2.4 and 2.5, but Python 2.6's
# -S addresses the problem in Python 2.4 and 2.5, but Python 2.6's
# distutils imports a value from the site module, so we unfortunately
# distutils imports a value from the site module, so we unfortunately
# have to do more drastic surgery in the _easy_install_
cmd
code below.
# have to do more drastic surgery in the _easy_install_
preface
code below.
#
#
# Here's an example of the .pth files created by setuptools when using that
# Here's an example of the .pth files created by setuptools when using that
# flag:
# flag:
...
@@ -357,9 +357,9 @@ class Installer:
...
@@ -357,9 +357,9 @@ class Installer:
warnings
.
warn
(
BROKEN_DASH_S_WARNING
)
warnings
.
warn
(
BROKEN_DASH_S_WARNING
)
self
.
_include_site_packages
=
True
self
.
_include_site_packages
=
True
self
.
_allowed_eggs_from_site_packages
=
(
'*'
,)
self
.
_allowed_eggs_from_site_packages
=
(
'*'
,)
self
.
_easy_install_cmd
=
_easy_install_preface
+
_easy_install_cmd
else
:
self
.
_easy_install_cmd
=
_easy_install_cmd
self
.
_easy_install_cmd
=
_easy_install_cmd
else
:
self
.
_easy_install_cmd
=
_easy_install_preface
+
_easy_install_cmd
self
.
_easy_install_cmd
=
_safe_arg
(
self
.
_easy_install_cmd
)
self
.
_easy_install_cmd
=
_safe_arg
(
self
.
_easy_install_cmd
)
stdlib
,
self
.
_site_packages
=
_get_system_paths
(
executable
)
stdlib
,
self
.
_site_packages
=
_get_system_paths
(
executable
)
version_info
=
_get_version_info
(
executable
)
version_info
=
_get_version_info
(
executable
)
...
...
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