summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2019-03-25 11:45:41 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-25 11:45:41 +0000
commit1ab80a03e6611cbc0e7480ce442717ca07f1a0ab (patch)
tree1c44874b993e0a0045cc9032304f920253542050
parenta6f2d34d6b58a120fa0425c480824603c1f882b1 (diff)
parentc8c2823e5ca3d71be4ab519e130cc4657df549b0 (diff)
downloadbuildstream-1ab80a03e6611cbc0e7480ce442717ca07f1a0ab.tar.gz
Merge branch 'bschubert/fix-double-lookup' into 'master'
plugin.py: Don't make a double lookup in the plugin table to get one See merge request BuildStream/buildstream!1253
-rw-r--r--buildstream/plugin.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/buildstream/plugin.py b/buildstream/plugin.py
index c139c8cb7..f9c1dd838 100644
--- a/buildstream/plugin.py
+++ b/buildstream/plugin.py
@@ -714,8 +714,11 @@ class Plugin():
#
@classmethod
def _lookup(cls, unique_id):
- assert unique_id in cls.__TABLE, "Could not find plugin with ID {}".format(unique_id)
- return cls.__TABLE[unique_id]
+ try:
+ return cls.__TABLE[unique_id]
+ except KeyError:
+ assert False, "Could not find plugin with ID {}".format(unique_id)
+ raise # In case a user is running with "python -O"
# _get_context()
#