Commit 1eaf4629 authored by Xavier Thompson's avatar Xavier Thompson

[fix] Sign .dist-info dists with version

This avoids rebootstrap changing the signature of zc.buildout when
the package is in sites-packages for the initial Python version but
not in the sites-packages of the target Python (when it's not the
same Python)
parent a7fbb5ab
...@@ -2174,7 +2174,8 @@ def _dists_sig(dists): ...@@ -2174,7 +2174,8 @@ def _dists_sig(dists):
seen.add(dist) seen.add(dist)
location = dist.location location = dist.location
if (dist.precedence == pkg_resources.DEVELOP_DIST if (dist.precedence == pkg_resources.DEVELOP_DIST
and location != zc.buildout.easy_install.python_lib): and location != zc.buildout.easy_install.python_lib
and not isinstance(dist, pkg_resources.DistInfoDistribution)):
result.append(dist.project_name + '-' + _dir_hash(location)) result.append(dist.project_name + '-' + _dir_hash(location))
else: else:
result.append(dist.project_name + '-' + dist.version) result.append(dist.project_name + '-' + dist.version)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment