_messenger: use silence ctx, not *_message_depth

Simplify by not calling _{push,pop}_message_depth outside of the silence
context manager, let that do the work instead.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/buildstream/_messenger.py b/src/buildstream/_messenger.py
index 6965081ad..49eaf3e4c 100644
--- a/src/buildstream/_messenger.py
+++ b/src/buildstream/_messenger.py
@@ -126,21 +126,19 @@ class Messenger():
                 # Push activity depth for status messages
                 message = Message(unique_id, MessageType.START, activity_name, detail=detail)
                 self.message(message)
-                self._push_message_depth(silent_nested)
-                yield
+                with self.silence(silent_nested):
+                    yield
 
             except BstError:
                 # Note the failure in status messages and reraise, the scheduler
                 # expects an error when there is an error.
                 elapsed = datetime.datetime.now() - starttime
                 message = Message(unique_id, MessageType.FAIL, activity_name, elapsed=elapsed)
-                self._pop_message_depth()
                 self.message(message)
                 raise
 
             elapsed = datetime.datetime.now() - starttime
             message = Message(unique_id, MessageType.SUCCESS, activity_name, elapsed=elapsed)
-            self._pop_message_depth()
             self.message(message)
 
     # recorded_messages()