launchpad-reviewers team mailing list archive

[Michael Hudson-Doyle <mp+492651@xxxxxxxxxxxxxxxxxx>]

Michael Hudson-Doyle has proposed merging ~mwhudson/launchpad:apt-ftparchive-no-filter-flag into launchpad:master.

Commit message:
pass -oAPT::FTPArchive::FilterByFileNameArchitecture=false" when invoking apt-ftparchive



Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~mwhudson/launchpad/+git/launchpad/+merge/492651
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~mwhudson/launchpad:apt-ftparchive-no-filter-flag into launchpad:master.

diff --git a/lib/lp/archivepublisher/model/ftparchive.py b/lib/lp/archivepublisher/model/ftparchive.py
index 26eb048..e05d939 100644
--- a/lib/lp/archivepublisher/model/ftparchive.py
+++ b/lib/lp/archivepublisher/model/ftparchive.py
@@ -179,7 +179,13 @@ class FTPArchiveHandler:
 
         stdout_handler = OutputLineHandler(self.log.debug, "a-f: ")
         stderr_handler = OutputLineHandler(self.log.info, "a-f: ")
-        base_command = ["apt-ftparchive"] + list(args) + [apt_config_filename]
+        base_command = (
+            [
+                "apt-ftparchive",
+            ]
+            + list(args)
+            + [apt_config_filename]
+        )
         spawner = CommandSpawner()
 
         returncodes = {}
@@ -207,7 +213,12 @@ class FTPArchiveHandler:
             )
 
     def runApt(self, apt_config_filename):
-        self.runAptWithArgs(apt_config_filename, "--no-contents", "generate")
+        self.runAptWithArgs(
+            apt_config_filename,
+            "-oAPT::FTPArchive::FilterByFileNameArchitecture=false",
+            "--no-contents",
+            "generate",
+        )
 
     #
     # Empty Pocket Requests
diff --git a/lib/lp/archivepublisher/scripts/generate_contents_files.py b/lib/lp/archivepublisher/scripts/generate_contents_files.py
index bd4f5e3..7daa99f 100644
--- a/lib/lp/archivepublisher/scripts/generate_contents_files.py
+++ b/lib/lp/archivepublisher/scripts/generate_contents_files.py
@@ -236,6 +236,7 @@ class GenerateContentsFiles(LaunchpadCronScript):
             self.logger,
             "apt-ftparchive",
             [
+                "-oAPT::FTPArchive::FilterByFileNameArchitecture=false",
                 "generate",
                 os.path.join(
                     self.content_archive,