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
8
Merge Requests
8
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
aa861eda
Commit
aa861eda
authored
May 31, 2024
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] Use requirement.key for index lookup
parent
4d36bf00
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 @
aa861eda
...
@@ -351,7 +351,7 @@ class Installer(object):
...
@@ -351,7 +351,7 @@ class Installer(object):
return
'
\
n
'
.
join
(
output
)
return
'
\
n
'
.
join
(
output
)
def
_satisfied
(
self
,
req
,
source
=
None
):
def
_satisfied
(
self
,
req
,
source
=
None
):
dists
=
[
dist
for
dist
in
self
.
_env
[
req
.
project_name
]
if
dist
in
req
]
dists
=
[
dist
for
dist
in
self
.
_env
[
req
.
key
]
if
dist
in
req
]
if
not
dists
:
if
not
dists
:
logger
.
debug
(
'We have no distributions for %s that satisfies %r.'
,
logger
.
debug
(
'We have no distributions for %s that satisfies %r.'
,
req
.
project_name
,
str
(
req
))
req
.
project_name
,
str
(
req
))
...
@@ -509,7 +509,7 @@ class Installer(object):
...
@@ -509,7 +509,7 @@ class Installer(object):
if
operator
==
'=='
:
if
operator
==
'=='
:
# But first, avoid any network access by checking local
# But first, avoid any network access by checking local
# urls. PackageIndex.add_find_links scans them immediately.
# urls. PackageIndex.add_find_links scans them immediately.
dists
=
[
dist
for
dist
in
index
[
requirement
.
project_name
]
dists
=
[
dist
for
dist
in
index
[
requirement
.
key
]
if
dist
in
requirement
and
filter_precedence
(
dist
)
and
(
if
dist
in
requirement
and
filter_precedence
(
dist
)
and
(
FILE_SCHEME
(
dist
.
location
)
or
FILE_SCHEME
(
dist
.
location
)
or
not
URL_SCHEME
(
dist
.
location
))]
not
URL_SCHEME
(
dist
.
location
))]
...
@@ -542,7 +542,7 @@ class Installer(object):
...
@@ -542,7 +542,7 @@ class Installer(object):
return
None
return
None
# Filter the available dists for the requirement and source flag
# Filter the available dists for the requirement and source flag
dists
=
[
dist
for
dist
in
index
[
requirement
.
project_name
]
dists
=
[
dist
for
dist
in
index
[
requirement
.
key
]
if
dist
in
requirement
and
filter_precedence
(
dist
)]
if
dist
in
requirement
and
filter_precedence
(
dist
)]
# If we prefer final dists, filter for final and use the
# If we prefer final dists, filter for final and use the
...
...
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