From ee3bf6f9773c0afbd494c657d253241f79d98044 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 4 Jun 2012 14:59:12 -0700
Subject: Handle more import exceptions involving xml.

See http://bugs.python.org/issue14988
---
 pym/repoman/herdbase.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pym/repoman')

diff --git a/pym/repoman/herdbase.py b/pym/repoman/herdbase.py
index 91a32cb00..fcf58b36c 100644
--- a/pym/repoman/herdbase.py
+++ b/pym/repoman/herdbase.py
@@ -7,7 +7,11 @@ import errno
 import xml.etree.ElementTree
 try:
 	from xml.parsers.expat import ExpatError
-except (ImportError, SystemError):
+except (SystemExit, KeyboardInterrupt):
+	raise
+except (ImportError, SystemError, RuntimeError, Exception):
+	# broken or missing xml support
+	# http://bugs.python.org/issue14988
 	# This means that python is built without xml support.
 	# We tolerate global scope import failures for optional
 	# modules, so that ImportModulesTestCase can succeed (or
-- 
cgit v1.2.3-1-g7c22