details: http://www.bx.psu.edu/hg/galaxy/rev/447c059a096a changeset: 3534:447c059a096a user: Nate Coraor <nate(a)bx.psu.edu&gt; date: Mon Mar 15 15:06:14 2010 -0400 description: Fix a bug in removing conflicts from the eggs directory diffstat: lib/galaxy/eggs/__init__.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (21 lines): diff -r ac60740712de -r 447c059a096a lib/galaxy/eggs/__init__.py --- a/lib/galaxy/eggs/__init__.py Mon Mar 15 14:35:35 2010 -0400 +++ b/lib/galaxy/eggs/__init__.py Mon Mar 15 15:06:14 2010 -0400 @@ -2,7 +2,7 @@ Manage Galaxy eggs """ -import os, sys, glob, urllib, urllib2, ConfigParser, HTMLParser, zipimport, zipfile +import os, sys, shutil, glob, urllib, urllib2, ConfigParser, HTMLParser, zipimport, zipfile import logging log = logging.getLogger( __name__ ) @@ -281,7 +281,7 @@ for egg in eggs: try: egg.resolve() - except: + except EggNotFetchable: missing.append( egg ) if missing: raise EggNotFetchable( missing )