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, 4 insertions, 3 deletions

diff --git a/src/buildstream/_includes.py b/src/buildstream/_includes.py
index 0ba40e63d..c04601b91 100644
--- a/src/buildstream/_includes.py
+++ b/src/buildstream/_includes.py
@@ -58,12 +58,13 @@ class Includes:
                         message = "{}: Include block references a file that could not be found: '{}'.".format(
                             include_provenance, include)
                         raise LoadError(message, LoadErrorReason.MISSING_FILE) from e
-                    elif e.reason == LoadErrorReason.LOADING_DIRECTORY:
+                    if e.reason == LoadErrorReason.LOADING_DIRECTORY:
                         message = "{}: Include block references a directory instead of a file: '{}'.".format(
                             include_provenance, include)
                         raise LoadError(message, LoadErrorReason.LOADING_DIRECTORY) from e
-                    else:
-                        raise
+
+                    # Otherwise, we don't know the reason, so just raise
+                    raise
 
                 if file_path in included:
                     include_provenance = includes_node.get_provenance()