Abort discovery on UserError

This commit is contained in:
Markus Unterwaditzer 2017-08-15 13:46:34 +02:00
parent 8565277623
commit c9a085522f

View file

@ -202,7 +202,12 @@ def _collection_from_discovered(get_discovered, collection, config,
def _print_collections(instance_name, get_discovered): def _print_collections(instance_name, get_discovered):
try: try:
discovered = get_discovered() discovered = get_discovered()
except exceptions.UserError:
raise
except Exception: except Exception:
# Unless discovery failed due to a user-inflicted error (instanceof
# UserError), we don't even know if the storage supports discovery
# properly. So we can't abort.
import traceback import traceback
logger.debug(''.join(traceback.format_tb(sys.exc_info()[2]))) logger.debug(''.join(traceback.format_tb(sys.exc_info()[2])))
logger.warning('Failed to discover collections for {}, use `-vdebug` ' logger.warning('Failed to discover collections for {}, use `-vdebug` '