refactor to use new machinery a little more

subiquity/server/controllers/filesystem.py

@@ -140,6 +140,11 @@ class CapabilityInfo:
         self.allowed.sort()
         self.disallowed.sort()
 
+    def copy(self) -> "CapabilityInfo":
+        return CapabilityInfo(
+            allowed=list(self.allowed), disallowed=list(self.disallowed)
+        )
+
     def disallow_if(
         self,
         filter: Callable[[GuidedCapability], bool],
@@ -160,6 +165,13 @@ class CapabilityInfo:
                 new_allowed.append(cap)
         self.allowed = new_allowed
 
+    def disallow_all(
+        self,
+        reason: GuidedDisallowedCapabilityReason,
+        message: Optional[str] = None,
+    ) -> None:
+        self.disallow_if(lambda cap: True, reason, message)
+
 
 @attr.s(auto_attribs=True)
 class VariationInfo:
@@ -180,22 +192,15 @@ class VariationInfo:
         gap: gaps.Gap,
         install_min: int,
     ) -> CapabilityInfo:
-        r = CapabilityInfo()
-        r.disallowed = list(self.capability_info.disallowed)
         if gap is None:
             gap_size = 0
         else:
             gap_size = gap.size
-        if self.capability_info.allowed and gap_size < install_min:
+        r = self.capability_info.copy()
-            for capability in self.capability_info.allowed:
+        if gap_size < install_min:
-                r.disallowed.append(
+            r.disallow_all(
-                    GuidedDisallowedCapability(
+                reason=GuidedDisallowedCapabilityReason.TOO_SMALL,
-                        capability=capability,
+            )
-                        reason=GuidedDisallowedCapabilityReason.TOO_SMALL,
-                    )
-                )
-        else:
-            r.allowed = list(self.capability_info.allowed)
         return r
 
     @classmethod