Fix a bug which could cause incorrect 'cyclic dependency' error. (#7178)

If there was an exception setting up one of the attributes of the Homeserver
god object, then future attempts to fetch that attribute would raise a
confusing "Cyclic dependency" error. Let's make sure that we clear the
`building` flag so that we just get the original exception.

Ref: #7169

changelog.d/7178.bugfix

@@ -0,0 +1 @@
+Fix a bug which could cause incorrect 'cyclic dependency' error.

synapse/server.py

@@ -583,25 +583,23 @@ def _make_dependency_method(depname):
         try:
             builder = getattr(hs, "build_%s" % (depname))
         except AttributeError:
-            builder = None
-
-        if builder:
-            # Prevent cyclic dependencies from deadlocking
-            if depname in hs._building:
-                raise ValueError("Cyclic dependency while building %s" % (depname,))
-            hs._building[depname] = 1
-
-            dep = builder()
-            setattr(hs, depname, dep)
-
-            del hs._building[depname]
-
-            return dep
-
             raise NotImplementedError(
                 "%s has no %s nor a builder for it" % (type(hs).__name__, depname)
             )
 
+        # Prevent cyclic dependencies from deadlocking
+        if depname in hs._building:
+            raise ValueError("Cyclic dependency while building %s" % (depname,))
+
+        hs._building[depname] = 1
+        try:
+            dep = builder()
+            setattr(hs, depname, dep)
+        finally:
+            del hs._building[depname]
+
+        return dep
+
     setattr(HomeServer, "get_%s" % (depname), _get)