diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-06-04 14:59:12 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-06-04 14:59:12 -0700 |
| commit | ee3bf6f9773c0afbd494c657d253241f79d98044 (patch) | |
| tree | 7ebb0d78586e80d97255ec363ba24db7fb1ea5c4 /pym/repoman | |
| parent | de996b1dd411bc2bc0363890dc284534d747174e (diff) | |
| download | portage-ee3bf6f9773c0afbd494c657d253241f79d98044.tar.gz portage-ee3bf6f9773c0afbd494c657d253241f79d98044.tar.bz2 portage-ee3bf6f9773c0afbd494c657d253241f79d98044.zip | |
Handle more import exceptions involving xml.
See http://bugs.python.org/issue14988
Diffstat (limited to 'pym/repoman')
| -rw-r--r-- | pym/repoman/herdbase.py | 6 |
1 files changed, 5 insertions, 1 deletions
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 |