From 01a6bfc106fefe55c9ff6ecd0247408236bbc893 Mon Sep 17 00:00:00 2001
From: Nate Coraor <nate@bx.psu.edu>
Date: Mon, 15 Mar 2010 15:06:14 -0400
Subject: [PATCH] Fix a bug in removing conflicts from the eggs directory

---
 lib/galaxy/eggs/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/galaxy/eggs/__init__.py b/lib/galaxy/eggs/__init__.py
index 398c0543e7f..60fdcf7cb9e 100644
--- a/lib/galaxy/eggs/__init__.py
+++ b/lib/galaxy/eggs/__init__.py
@@ -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 @@ class Crate( object ):
         for egg in eggs:
             try:
                 egg.resolve()
-            except:
+            except EggNotFetchable:
                 missing.append( egg )
         if missing:
             raise EggNotFetchable( missing )