Merge lp:~wgrant/launchpad/nai-fallback into lp:launchpad

[William Grant]

determine_architecture_to_build now falls back if nai is unavailable.

determine_architecture_to_build now falls back if nai is unavailable.

Some archives don't permit nominatedarchindep, and classically we haven't created arch-indep builds at all in those cases. But since the rework last year we fall back to one of the available architectures whenever "all" is not the only term, and now we fall back in that case as well. "all now behaves like "any all", just without the architecture-specific builds.

[William Grant (wgrant)]

This will cause many extra builds in arch-restricted copy archives.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lib/lp/soyuz/adapters/buildarch.py'
--- lib/lp/soyuz/adapters/buildarch.py	2015-02-11 09:51:48 +0000
+++ lib/lp/soyuz/adapters/buildarch.py	2015-12-31 00:02:25 +0000
@@ -65,15 +65,13 @@
 
     # Use the indep hint list if it's set, otherwise fall back to the
     # main architecture list. If that's not set either (ie. it's just
-    # "all"), default to nominatedarchindep.
+    # "all"), allow any available arch to be chosen.
     if indep_hint_list:
         indep_archs, _ = resolve_arch_spec(indep_hint_list, need_archs)
     elif not indep_only:
         indep_archs = set(build_archs)
-    elif nominated_arch_indep in need_archs:
-        indep_archs = set([nominated_arch_indep])
     else:
-        indep_archs = set()
+        indep_archs = set(need_archs)
 
     indep_arch = None
     if need_arch_indep:

=== modified file 'lib/lp/soyuz/adapters/tests/test_buildarch.py'
--- lib/lp/soyuz/adapters/tests/test_buildarch.py	2015-02-11 13:40:01 +0000
+++ lib/lp/soyuz/adapters/tests/test_buildarch.py	2015-12-31 00:02:25 +0000
@@ -122,12 +122,14 @@
         self.assertArchsForHint(
             'any-any', {'armel': False, 'hppa': False, 'i386': True})
 
-    def test_no_all_builds_when_nominatedarchindep_not_permitted(self):
-        # Some archives (eg. armel rebuilds) don't want arch-indep
-        # builds. If the nominatedarchindep architecture (normally
-        # i386) is omitted, no builds will be created for arch-indep
-        # sources.
-        self.assertArchsForHint('all', {}, allowed_arch_tags=['hppa'])
+    def test_disallowed_nominatedarchindep_falls_back(self):
+        # Some archives don't allow nominatedarchindep builds. In that
+        # case, one of the other architectures is chosen.
+        self.assertArchsForHint(
+            'any all', {'hppa': True, 'armel': False},
+            allowed_arch_tags=['hppa', 'armel'])
+        self.assertArchsForHint(
+            'all', {'hppa': True}, allowed_arch_tags=['hppa', 'armel'])
 
     def test_indep_hint_only(self):
         # Some packages need to build arch-indep builds on a specific