Merge ~apw/launchpad-buildd/+git/my:handle-build-depends-arch into launchpad-buildd:master

[Andy Whitcroft]

Include Build-Depends-Arch when considering direct dependencies

When we consider if reported missing dependency is likely reliable we consider whether it is a direct dependency. Currently we check Build-Depends: and Build-Depends-Indep: for this. Direct dependencies on Build-Depends-Arch are not considered. Add these as well.

[Colin Watson (cjwatson)]

Could you add a debian/changelog entry for this?

[Andy Whitcroft (apw)]

Ok, hopefully that covers all of the review comments.

[Colin Watson (cjwatson)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index f1af9cc..f458954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+launchpad-buildd (221 UNRELEASED; urgency=medium
+
+  * Include Build-Depends-Arch when considering direct dependancies
+    (LP: #1988999)
+
+ -- Andy Whitcroft <[e-mail]>  Wed, 07 Sep 2022 20:47:49 +0100
+
 launchpad-buildd (220) focal; urgency=medium
 
   * Work around https://github.com/lxc/lxcfs/issues/553 by unmounting
diff --git a/lpbuildd/binarypackage.py b/lpbuildd/binarypackage.py
index 96685c5..c3fef09 100644
--- a/lpbuildd/binarypackage.py
+++ b/lpbuildd/binarypackage.py
@@ -250,7 +250,7 @@ class BinaryPackageBuildManager(DebianBuildManager):
         deps = []
         with open(dscpath, "rb") as dscfile:
             dsc = Dsc(dscfile)
-            fields = ["Build-Depends"]
+            fields = ["Build-Depends", "Build-Depends-Arch"]
             if arch_indep:
                 fields.append("Build-Depends-Indep")
             for field in fields:
diff --git a/lpbuildd/tests/test_binarypackage.py b/lpbuildd/tests/test_binarypackage.py
index 9e3e155..9b1a0fa 100644
--- a/lpbuildd/tests/test_binarypackage.py
+++ b/lpbuildd/tests/test_binarypackage.py
@@ -409,7 +409,7 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
         self.assertEqual(expected, self.buildmanager.getAvailablePackages())
 
     def test_getBuildDepends_arch_dep(self):
-        # getBuildDepends returns only Build-Depends for
+        # getBuildDepends returns Build-Depends and Build-Depends-Arch for
         # architecture-dependent builds.
         dscpath = os.path.join(
             self.working_dir, "build-%s" % self.buildid, "foo.dsc")
@@ -418,6 +418,7 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
             dedent("""\
                 Package: foo
                 Build-Depends: debhelper (>= 9~), bar | baz
+                Build-Depends-Arch: qux
                 Build-Depends-Indep: texlive-base
                 """))
         self.assertThat(
@@ -432,11 +433,14 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
                 MatchesListwise([
                     ContainsDict({"name": Equals("bar"), "version": Is(None)}),
                     ContainsDict({"name": Equals("baz"), "version": Is(None)}),
+                    ]),
+                MatchesListwise([
+                    ContainsDict({"name": Equals("qux"), "version": Is(None)}),
                     ])]))
 
     def test_getBuildDepends_arch_indep(self):
-        # getBuildDepends returns both Build-Depends and Build-Depends-Indep
-        # for architecture-independent builds.
+        # getBuildDepends returns Build-Depends, Build-Depends-Arch, and
+        # Build-Depends-Indep for architecture-independent builds.
         dscpath = os.path.join(
             self.working_dir, "build-%s" % self.buildid, "foo.dsc")
         write_file(
@@ -444,6 +448,7 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
             dedent("""\
                 Package: foo
                 Build-Depends: debhelper (>= 9~), bar | baz
+                Build-Depends-Arch: qux
                 Build-Depends-Indep: texlive-base
                 """))
         self.assertThat(
@@ -460,6 +465,9 @@ class TestBinaryPackageBuildManagerIteration(TestCase):
                     ContainsDict({"name": Equals("baz"), "version": Is(None)}),
                     ]),
                 MatchesListwise([
+                    ContainsDict({"name": Equals("qux"), "version": Is(None)}),
+                    ]),
+                MatchesListwise([
                     ContainsDict({
                         "name": Equals("texlive-base"),
                         "version": Is(None),