launchpad-reviewers team mailing list archive

[Michael Vogt <michael.vogt@xxxxxxxxxxxxx>]

Michael Vogt has proposed merging lp:~mvo/launchpad/lp1313576-uncompressed into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~mvo/launchpad/lp1313576-uncompressed/+merge/239984

It is great that the Translation-* files are now included in the Release file. Unfortunately apt expects the hashes of the uncompressed files as well. The attached branch should fix this.

I have not actually run the tests as I don't have a full launchpad development environment right now. I'm happy to setup one if needed and if there is more fallout from this change than I anticipated.
-- 
https://code.launchpad.net/~mvo/launchpad/lp1313576-uncompressed/+merge/239984
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~mvo/launchpad/lp1313576-uncompressed into lp:launchpad.

=== modified file 'lib/lp/archivepublisher/publishing.py'
--- lib/lp/archivepublisher/publishing.py	2014-08-01 03:23:44 +0000
+++ lib/lp/archivepublisher/publishing.py	2014-10-29 14:09:16 +0000
@@ -935,10 +935,6 @@
             for i18n_file in os.listdir(i18n_dir):
                 if not i18n_file.startswith('Translation-'):
                     continue
-                if not i18n_file.endswith('.bz2'):
-                    # Save bandwidth: mirrors should only need the .bz2
-                    # versions.
-                    continue
                 i18n_files.append(i18n_file)
         except OSError as e:
             if e.errno != errno.ENOENT:

=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
--- lib/lp/archivepublisher/tests/test_publisher.py	2014-08-01 11:16:29 +0000
+++ lib/lp/archivepublisher/tests/test_publisher.py	2014-10-29 14:09:16 +0000
@@ -1930,9 +1930,9 @@
         self.assertEqual(str(len(translation_en_contents)),
                          i18n_index['sha1'][0]['size'])
 
-        # i18n/Index and i18n/Translation-en.bz2 are scheduled for inclusion
-        # in Release.
-        self.assertEqual(2, len(all_files))
+        # i18n/Index,  i18n/Translation-en, i18n/Translation-en.bz2
+        # are scheduled for inclusion in Release.
+        self.assertEqual(3, len(all_files))
         self.assertEqual(
             os.path.join('main', 'i18n', 'Index'), all_files.pop())
         self.assertEqual(