Merge branch 'master' into 2761-diagnostic-suite

diff --git a/sdk/python/arvados/collection.py b/sdk/python/arvados/collection.py
index a06a17faeeb051e0edeee277535c9b8d969db9ce..686d694befec9d1aec84c43dcbe360b0a6008b09 100644 (file)
--- a/sdk/python/arvados/collection.py
+++ b/sdk/python/arvados/collection.py
@@ -135,6 +135,9 @@ class CollectionReader(object):
                     uuid=self._manifest_locator).execute()
                 self._manifest_text = c['manifest_text']
             except Exception as e:
+                if not util.portable_data_hash_pattern.match(
+                      self._manifest_locator):
+                    raise
                 _logger.warning("API lookup failed for collection %s (%s: %s)",
                                 self._manifest_locator, type(e), str(e))
                 if self._keep_client is None: