Merge ~tsimonq2/germinate:master into germinate:master

[Simon Quigley]

Do not include NBS packages (LP: #2056483)

[Julian Andres Klode (juliank)]

On the one hand this makes sense for the bug at hand, but this fails to take into consideration the wider effect of how libraries migrate. We have britney set to SMOOTH_UPDATES = libs oldlibs such that e.g. a new libefivar2 can migrate while packages still Depend on libefivar1, as long as they are co-installable.

The proposed change here would break image building in that case which does not seem the right cause of action.

review: Disapprove

Unmerged commits

faccdf1... by Simon Quigley on 2024-03-07

Do not include NBS packages (LP: #2056483)

test:0 (build)

1 → 1 of 1 result

First • Previous • Next • Last

diff --git a/germinate/germinator.py b/germinate/germinator.py
index 0a57068..34b2d51 100644
--- a/germinate/germinator.py
+++ b/germinate/germinator.py
@@ -576,6 +576,18 @@ class Germinator:
                 dep_list.append(" | ".join(or_list))
         return ", ".join(dep_list)
 
+    def _strip_nbs(self):
+        bins = set()
+        for src in self._sources.values():
+            bins.update(src["Binaries"])
+
+        all_bins = set(self._packages.keys())
+        nbs = all_bins - bins
+
+        # Remove binaries not built from any source
+        for binary in nbs:
+            del self._packages[binary]
+
     def _parse_src_depends(self, value):
         """Parse Build-Depends from value, without stripping qualifiers."""
         try:
@@ -635,6 +647,8 @@ class Germinator:
             else:
                 raise ValueError("Unknown index type %d" % indextype)
 
+        self._strip_nbs()
+
         # Construct a more convenient representation of Provides fields.
         for pkg in sorted(self._packages):
             for prov in self._packages[pkg]["Provides"]: