launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/launchpad/post-824553 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #824553 in Launchpad itself: "publish-ftpmaster script runs publisher too many times"
  https://bugs.launchpad.net/launchpad/+bug/824553

For more details, see:
https://code.launchpad.net/~jtv/launchpad/post-824553/+merge/72389

= Summary =

I just spotted some vestigial code of mine in publish-ftpmaster.  This may have been an oversight on my part, or an artifact of a merge where a few branches crossed paths.


== Proposed fix ==

Remove it!  The code is duplicated elsewhere, since I had extracted it into a method of its own.


== Pre-implementation notes ==

Not worth a pre-imp.


== Implementation details ==

The vestigial code could never have run, because both the redundant execution path and its replacement exit the script early.


== Tests ==

{{{
./bin/test -vvc lp.archivepublisther.tests.test_publish_ftpmaster
}}}


== Demo and Q/A ==

Create a new distroseries.  Upload a package to it.  Run scripts/process-uploads.  Set the series' status to pre-release freeze.  Then run publish-ftpmaster on it.

Indexes should be created for the new series: see /srv/launchpad.net/<distro>-archive/<distro>, and look for the hidden files that mark index creation.


= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/archivepublisher/scripts/publish_ftpmaster.py
-- 
https://code.launchpad.net/~jtv/launchpad/post-824553/+merge/72389
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/launchpad/post-824553 into lp:launchpad.

=== modified file 'lib/lp/archivepublisher/scripts/publish_ftpmaster.py'
--- lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2011-08-19 08:27:39 +0000
+++ lib/lp/archivepublisher/scripts/publish_ftpmaster.py	2011-08-22 08:15:24 +0000
@@ -595,14 +595,6 @@
             # We've done enough here.  Leave some server time for others.
             return
 
-        for series in distribution.series:
-            suites_needing_indexes = self.listSuitesNeedingIndexes(series)
-            if len(suites_needing_indexes) > 0:
-                self.createIndexes(distribution, suites_needing_indexes)
-                # Don't try to do too much in one run.  Leave the rest
-                # of the work for next time.
-                return
-
         self.processAccepted(distribution)
 
         self.rsyncBackupDists(distribution)