launchpad-reviewers team mailing list archive

[Adam Conrad <adconrad@xxxxxxx>]

Adam Conrad has proposed merging lp:~adconrad/launchpad/no-contents-security into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~adconrad/launchpad/no-contents-security/+merge/252065

I noticed that security_only runs are wasting 20 to 30 seconds on copying Contents in, which is entirely unnecessary, since it happens again later in the full run.  This fixes that.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~adconrad/launchpad/no-contents-security into lp:launchpad.

=== modified file 'lib/lp/archivepublisher/scripts/publish_ftpmaster.py'
--- lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2015-02-13 10:43:03 +0000
+++ lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2015-03-06 08:02:58 +0000
@@ -595,11 +595,10 @@
                 has_published = self.publishSecurityUploads(distribution)
             else:
                 self.publishDistroUploads(distribution)
+                self.updateContentsFiles(distribution)
                 # Let's assume the main archive is always modified
                 has_published = True
 
-            self.updateContentsFiles(distribution)
-
             # Swizzle the now-updated backup dists and the current dists
             # around.
             self.installDists(distribution)