launchpad-reviewers team mailing list archive

[Stuart Bishop <stuart.bishop@xxxxxxxxxxxxx>]

Stuart Bishop has proposed merging lp:~stub/launchpad/trivial into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #951401 in Launchpad itself: "parse-ppa-apache-logs failing (missing files)"
  https://bugs.launchpad.net/launchpad/+bug/951401
  Bug #1263002 in Launchpad itself: "Twisted feature flag support fails typecasting when updating"
  https://bugs.launchpad.net/launchpad/+bug/1263002

For more details, see:
https://code.launchpad.net/~stub/launchpad/trivial/+merge/233498

Ensure that librarian-feed-swift descends the directory structure in order, so we upload in order, so we are able to kill and resume the job more easily.
-- 
https://code.launchpad.net/~stub/launchpad/trivial/+merge/233498
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stub/launchpad/trivial into lp:launchpad.

=== modified file 'lib/lp/services/librarianserver/swift.py'
--- lib/lp/services/librarianserver/swift.py	2014-01-07 08:02:15 +0000
+++ lib/lp/services/librarianserver/swift.py	2014-09-05 11:51:40 +0000
@@ -67,6 +67,10 @@
             or end_fs_path[:len(dirpath)] < dirpath):
             dirnames[:] = []
             continue
+        else:
+            # We need to descent in order, making it possible to resume
+            # an aborted job.
+            dirnames.sort()
 
         log.debug('Scanning {0} for matching files'.format(dirpath))