details:
http://www.bx.psu.edu/hg/galaxy/rev/e5ae8c367b18
changeset: 3198:e5ae8c367b18
user: Nate Coraor <nate(a)bx.psu.edu>
date: Mon Jan 04 15:45:41 2010 -0500
description:
Fix a pkg_resources.require bug where certain types of version conflicts would raise an
exception and the require would fail.
diffstat:
lib/galaxy/eggs/__init__.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diffs (13 lines):
diff -r 0e5788188e23 -r e5ae8c367b18 lib/galaxy/eggs/__init__.py
--- a/lib/galaxy/eggs/__init__.py Mon Jan 04 15:25:47 2010 -0500
+++ b/lib/galaxy/eggs/__init__.py Mon Jan 04 15:45:41 2010 -0500
@@ -526,7 +526,9 @@
raise Exception( "Cannot remove entry: %s" % str(entry) )
r = require( pkg )
if location is not None and not location.endswith( '.egg' ):
+ # re-add the path if it's a non-egg dir, in case more deps live there
working_set.entries.append( location ) # re-add to the set if it's a
dir.
+ sys.path.append( location ) # re-add to the set if it's a dir.
return r
except pkg_resources.DistributionNotFound, e:
# the initial require itself is the first dep, but it can have