Merge lp:~wgrant/launchpad/turn-off-parallel-a-f into lp:launchpad

[William Grant]

[r=adeuring][bug=729003] Turn off parallel apt-ftparchive; --arch doesn't actually help us at all.

Deeper QA of the recent parallel apt-ftparchive changes revealed that --arch doesn't actually restrict the work that a-f does, so we ended up just doing the same work several times in parallel.

This branch reverts a-f to a single run, until we can fix it properly next release.

[Abel Deuring (adeuring)]

review: Approve (code)

=== modified file 'lib/lp/archivepublisher/model/ftparchive.py'
--- lib/lp/archivepublisher/model/ftparchive.py	2011-02-25 11:54:05 +0000
+++ lib/lp/archivepublisher/model/ftparchive.py	2011-03-04 11:42:42 +0000
@@ -167,14 +167,12 @@
         spawner = CommandSpawner()
 
         returncodes = {}
-        for arch_tag in self._getArchitectureTags().union(set(["source"])):
-            completion_handler = ReturnCodeReceiver()
-            returncodes[arch_tag] = completion_handler
-            command = base_command + ["--arch", arch_tag]
-            spawner.start(
-                command, stdout_handler=stdout_handler,
-                stderr_handler=stderr_handler,
-                completion_handler=completion_handler)
+        completion_handler = ReturnCodeReceiver()
+        returncodes['all'] = completion_handler
+        spawner.start(
+            base_command, stdout_handler=stdout_handler,
+            stderr_handler=stderr_handler,
+            completion_handler=completion_handler)
 
         spawner.complete()
         stdout_handler.finalize()