[galaxy-commits] commit/galaxy-central: natefoo: Another bugfix for egg conflicts, don't add items to the pkg_resources working set unless the item's not already in there.

1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/6d5331f3b468/ changeset: r5041:6d5331f3b468 user: natefoo date: 2011-02-10 21:53:06 summary: Another bugfix for egg conflicts, don't add items to the pkg_resources working set unless the item's not already in there. affected #: 1 file (79 bytes)

--- a/lib/galaxy/eggs/__init__.py Thu Feb 10 15:29:08 2011 -0500 +++ b/lib/galaxy/eggs/__init__.py Thu Feb 10 15:53:06 2011 -0500 @@ -212,7 +212,8 @@ try: dists = self.resolve() for dist in dists: - pkg_resources.working_set.add( dist ) + if dist.location not in pkg_resources.working_set.entries: + pkg_resources.working_set.add( dist ) return dists except: raise

Repository URL: https://bitbucket.org/galaxy/galaxy-central/

--

This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.