From b30a269ec2477e84e1b765379f9cebf0cfcb1939 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx <zooko@zooko.com> Date: Fri, 28 Jan 2011 08:20:06 -0700 Subject: [PATCH] setup: don't catch all Exception from check_requirement(), but only PackagingError and ImportError I noticed this because I had accidentally inserted a bug which caused AssertionError to be raised from check_requirement(). --- src/allmydata/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py index 6bb20d81..c404276c 100644 --- a/src/allmydata/__init__.py +++ b/src/allmydata/__init__.py @@ -373,7 +373,7 @@ def check_all_requirements(): for requirement in install_requires: try: check_requirement(requirement, vers_and_locs) - except Exception, e: + except (ImportError, PackagingError), e: errors.append("%s: %s" % (e.__class__.__name__, e)) if errors: -- 2.45.2