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 /bin | |
| parent | repoman: fix _mask_manager assignment (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 'bin')
| -rwxr-xr-x | bin/repoman | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman index 052ec9436..e43fa1cd5 100755 --- a/bin/repoman +++ b/bin/repoman @@ -45,7 +45,11 @@ portage.dep._internal_warnings = True try: import xml.etree.ElementTree 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 msg = ["Please enable python's \"xml\" USE flag in order to use repoman."] from portage.output import EOutput out = EOutput() |