Fixes.

ognibuild/fix_build.py

@@ -89,9 +89,7 @@ def iterate_with_build_fixers(fixers: List[BuildFixer], cb: Callable[[], Any]):
                 )
                 raise f
             try:
-                if not resolve_error(f.error, None, fixers=fixers):
+                resolved = resolve_error(f.error, None, fixers=fixers)
-                    logging.warning("Failed to find resolution for error %r. Giving up.", f.error)
-                    raise f
             except DetailedFailure as n:
                 logging.info('New error %r while resolving %r', n, f)
                 if n in to_resolve:
@@ -99,6 +97,9 @@ def iterate_with_build_fixers(fixers: List[BuildFixer], cb: Callable[[], Any]):
                 to_resolve.append(f)
                 to_resolve.append(n)
             else:
+                if not resolved:
+                    logging.warning("Failed to find resolution for error %r. Giving up.", f.error)
+                    raise f
                 fixed_errors.append(f.error)
 
 

ognibuild/resolver/__init__.py

@@ -436,6 +436,8 @@ class StackedResolver(Resolver):
                 requirements = e.requirements
             else:
                 return
+        if requirements:
+            raise UnsatisfiedRequirements(requirements)
 
 
 NATIVE_RESOLVER_CLS = [

ognibuild/resolver/apt.py

@@ -73,6 +73,8 @@ from ..requirements import (
 class AptRequirement(Requirement):
     def __init__(self, relations):
         super(AptRequirement, self).__init__("apt")
+        if not isinstance(relations, list):
+            raise TypeError(relations)
         self.relations = relations
 
     @classmethod