launchpad-reviewers team mailing list archive

[Enrique Sánchez <mp+493369@xxxxxxxxxxxxxxxxxx>]

Enrique Sánchez has proposed merging ~enriqueesanchz/launchpad:revert-apt-ftparchive-no-filter-flag into launchpad:master.

Commit message:
Revert "pass -oAPT::FTPArchive::FilterByFileNameArchitecture=false" when invoking apt-ftparchive"
    
This reverts commit f1e77d075e8ae660750da37a3545d070e0489e94.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~enriqueesanchz/launchpad/+git/launchpad/+merge/493369
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~enriqueesanchz/launchpad:revert-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 e05d939..26eb048 100644
--- a/lib/lp/archivepublisher/model/ftparchive.py
+++ b/lib/lp/archivepublisher/model/ftparchive.py
@@ -179,13 +179,7 @@ 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 = {}
@@ -213,12 +207,7 @@ class FTPArchiveHandler:
             )
 
     def runApt(self, apt_config_filename):
-        self.runAptWithArgs(
-            apt_config_filename,
-            "-oAPT::FTPArchive::FilterByFileNameArchitecture=false",
-            "--no-contents",
-            "generate",
-        )
+        self.runAptWithArgs(apt_config_filename, "--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 7daa99f..bd4f5e3 100644
--- a/lib/lp/archivepublisher/scripts/generate_contents_files.py
+++ b/lib/lp/archivepublisher/scripts/generate_contents_files.py
@@ -236,7 +236,6 @@ class GenerateContentsFiles(LaunchpadCronScript):
             self.logger,
             "apt-ftparchive",
             [
-                "-oAPT::FTPArchive::FilterByFileNameArchitecture=false",
                 "generate",
                 os.path.join(
                     self.content_archive,