summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQinusty <jrsmith9822@gmail.com>2018-08-21 15:46:14 +0000
committerQinusty <jrsmith9822@gmail.com>2018-08-21 15:46:14 +0000
commitd8256c74e3485d17d56f027c51ccf2c7100ac754 (patch)
tree3bebfb55ba32ea941e448b4c144e063e9095c367
parent320b95627123eab634b6642e7cd5c5e2083e04cf (diff)
parentef60622925da594c7eda3d78781db80861ebe1dd (diff)
downloadbuildstream-d8256c74e3485d17d56f027c51ccf2c7100ac754.tar.gz
Merge branch 'Qinusty/598-fatal-warning-none-detail' into 'master'
Fatal warnings no longer print None when detail=None See merge request BuildStream/buildstream!694
-rw-r--r--buildstream/plugin.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/buildstream/plugin.py b/buildstream/plugin.py
index 4514ee355..a65db4d42 100644
--- a/buildstream/plugin.py
+++ b/buildstream/plugin.py
@@ -508,6 +508,7 @@ class Plugin():
project = self._get_project()
if project._warning_is_fatal(warning_token):
+ detail = detail if detail else ""
raise PluginError(message="{}\n{}".format(brief, detail), reason=warning_token)
self.__message(MessageType.WARN, brief=brief, detail=detail)