Address no-else-raise pylint warning

In the latest released version of pylint (2.3.x), the
"no-else-raise" (R1720) warning has been introduced.

See:
http://pylint.pycqa.org/en/latest/whatsnew/changelog.html#what-s-new-in-pylint-2-3-0

There are many instances of this in our codebase, which this
patch addresses.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/buildstream/_stream.py b/src/buildstream/_stream.py
index b3e0a6183..2e43bb1a2 100644
--- a/src/buildstream/_stream.py
+++ b/src/buildstream/_stream.py
@@ -217,8 +217,8 @@ class Stream():
                     message = "Buildtree is not cached locally or in available remotes"
                     if usebuildtree == "always":
                         raise StreamError(message)
-                    else:
-                        self._message(MessageType.INFO, message + ", shell will be loaded without it")
+
+                    self._message(MessageType.INFO, message + ", shell will be loaded without it")
             else:
                 buildtree = True
 
@@ -481,9 +481,9 @@ class Stream():
                 msg = "{} is not cached".format(element.name)
                 if self._context.sched_error_action != _SchedulerErrorAction.CONTINUE:
                     raise StreamError("Push failed: " + msg)
-                else:
-                    self._message(MessageType.WARN, msg)
-                    uncached_elements.append(element)
+
+                self._message(MessageType.WARN, msg)
+                uncached_elements.append(element)
 
         if cached_elements:
             self._scheduler.clear_queues()
@@ -1356,7 +1356,7 @@ class Stream():
 
         if status == SchedStatus.ERROR:
             raise StreamError()
-        elif status == SchedStatus.TERMINATED:
+        if status == SchedStatus.TERMINATED:
             raise StreamError(terminated=True)
 
     # _fetch()