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
isaak yansane-sisk
slapos.buildout
Commits
a9195197
Commit
a9195197
authored
Sep 19, 2006
by
Jim Fulton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
When generating distribution signatures, the location of a non-develop
egg is not important.
parent
412c9227
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
6 deletions
+3
-6
src/zc/buildout/buildout.py
src/zc/buildout/buildout.py
+3
-6
No files found.
src/zc/buildout/buildout.py
View file @
a9195197
...
@@ -436,14 +436,13 @@ class Buildout(dict):
...
@@ -436,14 +436,13 @@ class Buildout(dict):
def
_compute_part_signatures
(
self
,
parts
):
def
_compute_part_signatures
(
self
,
parts
):
# Compute recipe signature and add to options
# Compute recipe signature and add to options
base
=
self
[
'buildout'
][
'eggs-directory'
]
+
os
.
path
.
sep
for
part
in
parts
:
for
part
in
parts
:
options
=
self
.
get
(
part
)
options
=
self
.
get
(
part
)
if
options
is
None
:
if
options
is
None
:
options
=
self
[
part
]
=
{}
options
=
self
[
part
]
=
{}
recipe
,
entry
=
self
.
_recipe
(
part
,
options
)
recipe
,
entry
=
self
.
_recipe
(
part
,
options
)
req
=
pkg_resources
.
Requirement
.
parse
(
recipe
)
req
=
pkg_resources
.
Requirement
.
parse
(
recipe
)
sig
=
_dists_sig
(
pkg_resources
.
working_set
.
resolve
([
req
])
,
base
)
sig
=
_dists_sig
(
pkg_resources
.
working_set
.
resolve
([
req
]))
options
[
'__buildout_signature__'
]
=
' '
.
join
(
sig
)
options
[
'__buildout_signature__'
]
=
' '
.
join
(
sig
)
def
_recipe
(
self
,
part
,
options
):
def
_recipe
(
self
,
part
,
options
):
...
@@ -754,16 +753,14 @@ def _dir_hash(dir):
...
@@ -754,16 +753,14 @@ def _dir_hash(dir):
hash
.
update
(
open
(
os
.
path
.
join
(
dirpath
,
name
)).
read
())
hash
.
update
(
open
(
os
.
path
.
join
(
dirpath
,
name
)).
read
())
return
hash
.
digest
().
encode
(
'base64'
).
strip
()
return
hash
.
digest
().
encode
(
'base64'
).
strip
()
def
_dists_sig
(
dists
,
base
):
def
_dists_sig
(
dists
):
result
=
[]
result
=
[]
for
dist
in
dists
:
for
dist
in
dists
:
location
=
dist
.
location
location
=
dist
.
location
if
dist
.
precedence
==
pkg_resources
.
DEVELOP_DIST
:
if
dist
.
precedence
==
pkg_resources
.
DEVELOP_DIST
:
result
.
append
(
dist
.
project_name
+
'-'
+
_dir_hash
(
location
))
result
.
append
(
dist
.
project_name
+
'-'
+
_dir_hash
(
location
))
else
:
else
:
if
location
.
startswith
(
base
):
result
.
append
(
os
.
path
.
basename
(
location
))
location
=
location
[
len
(
base
):]
result
.
append
(
location
)
return
result
return
result
def
_update
(
d1
,
d2
):
def
_update
(
d1
,
d2
):
...
...
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