launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:publisher-sort-release-better into launchpad:master.

Commit message:
Improve sorting of checksums in Release files

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/396034

The checksums in Release files were sorted only by the directory part of their file name, causing the order to be indeterminate: this caused a test failure in soyuz-upload.txt on Python 3.  There seems no good reason not to use a total ordering instead.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:publisher-sort-release-better into launchpad:master.

diff --git a/lib/lp/archivepublisher/publishing.py b/lib/lp/archivepublisher/publishing.py
index 1edd38d..664f1fc 100644
--- a/lib/lp/archivepublisher/publishing.py
+++ b/lib/lp/archivepublisher/publishing.py
@@ -1267,7 +1267,7 @@ class Publisher(object):
             release_file["NotAutomatic"] = "yes"
             release_file["ButAutomaticUpgrades"] = "yes"
 
-        for filename in sorted(all_files, key=os.path.dirname):
+        for filename in sorted(all_files):
             hashes = self._readIndexFileHashes(suite, filename)
             if hashes is None:
                 continue