Merge lp:~julian-edwards/launchpad/ppa-components-bug-662088 into lp:launchpad

[Julian Edwards]

Make sure that we only publish the "main" component for PPA indexes. Currently it processes all components unnecessarily which wastes a lot of time.

The PPA publisher currently publishes indexes for all components we know about. PPAs only have "main" and this change makes sure we only publish main.

[Julian Edwards (julian-edwards)]

review: Approve (code)

[Jelmer Vernooij (jelmer)]

review: Approve (code)

=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
--- lib/lp/archivepublisher/tests/test_publisher.py	2010-11-09 08:26:37 +0000
+++ lib/lp/archivepublisher/tests/test_publisher.py	2010-12-02 17:41:38 +0000
@@ -886,19 +886,19 @@
         self.assertTrue(md5_header in release_contents)
         md5_header_index = release_contents.index(md5_header)
 
-        plain_sources_md5_line = release_contents[md5_header_index + 15]
+        plain_sources_md5_line = release_contents[md5_header_index + 16]
         self.assertEqual(
             plain_sources_md5_line,
             (' 7d9b0817f5ff4a1d3f53f97bcc9c7658              '
              '229 main/source/Sources'))
-        release_md5_line = release_contents[md5_header_index + 17]
+        release_md5_line = release_contents[md5_header_index + 15]
         self.assertEqual(
             release_md5_line,
             (' eadc1fbb1a878a2ee6dc66d7cd8d46dc              '
             '130 main/source/Release'))
         # We can't probe checksums of compressed files because they contain
         # timestamps, their checksum varies with time.
-        bz2_sources_md5_line = release_contents[md5_header_index + 16]
+        bz2_sources_md5_line = release_contents[md5_header_index + 17]
         self.assertTrue('main/source/Sources.bz2' in bz2_sources_md5_line)
         gz_sources_md5_line = release_contents[md5_header_index + 18]
         self.assertTrue('main/source/Sources.gz' in gz_sources_md5_line)
@@ -907,18 +907,18 @@
         self.assertTrue(sha1_header in release_contents)
         sha1_header_index = release_contents.index(sha1_header)
 
-        plain_sources_sha1_line = release_contents[sha1_header_index + 15]
+        plain_sources_sha1_line = release_contents[sha1_header_index + 16]
         self.assertEqual(
             plain_sources_sha1_line,
             (' a2da1a8407fc4e2373266e56ccc7afadf8e08a3a              '
              '229 main/source/Sources'))
-        release_sha1_line = release_contents[sha1_header_index + 17]
+        release_sha1_line = release_contents[sha1_header_index + 15]
         self.assertEqual(
             release_sha1_line,
             (' 1a8d788a6d2d30e0cab002ab82e9f2921f7a2a61              '
              '130 main/source/Release'))
         # See above.
-        bz2_sources_sha1_line = release_contents[sha1_header_index + 16]
+        bz2_sources_sha1_line = release_contents[sha1_header_index + 17]
         self.assertTrue('main/source/Sources.bz2' in bz2_sources_sha1_line)
         gz_sources_sha1_line = release_contents[sha1_header_index + 18]
         self.assertTrue('main/source/Sources.gz' in gz_sources_sha1_line)
@@ -927,18 +927,18 @@
         self.assertTrue(sha256_header in release_contents)
         sha256_header_index = release_contents.index(sha256_header)
 
-        plain_sources_sha256_line = release_contents[sha256_header_index + 15]
+        plain_sources_sha256_line = release_contents[sha256_header_index + 16]
         self.assertEqual(
             plain_sources_sha256_line,
             (' 979d959ead8ddc29e4347a64058a372d30df58a51a4615b43fb7499'
              '8a9e07c78              229 main/source/Sources'))
-        release_sha256_line = release_contents[sha256_header_index + 17]
+        release_sha256_line = release_contents[sha256_header_index + 15]
         self.assertEqual(
             release_sha256_line,
             (' 795a3f17d485cc1983f588c53fb8c163599ed191be9741e61ca411f'
              '1e2c505aa              130 main/source/Release'))
         # See above.
-        bz2_sources_sha256_line = release_contents[sha256_header_index + 16]
+        bz2_sources_sha256_line = release_contents[sha256_header_index + 17]
         self.assertTrue('main/source/Sources.bz2' in bz2_sources_sha256_line)
         gz_sources_sha256_line = release_contents[sha256_header_index + 18]
         self.assertTrue('main/source/Sources.gz' in gz_sources_sha256_line)
 
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-11-02 21:44:42 +0000
+++ lib/lp/soyuz/model/archive.py	2010-12-02 17:41:38 +0000
@@ -843,6 +843,8 @@
     def getComponentsForSeries(self, distroseries):
         if self.is_partner:
             return [getUtility(IComponentSet)['partner']]
+        elif self.is_ppa:
+            return [getUtility(IComponentSet)['main']]
         else:
             return distroseries.components
 
 
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-11-02 21:44:42 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-12-02 17:41:38 +0000
@@ -1463,7 +1463,7 @@
 
     def test_series_components_for_primary_archive(self):
         # The primary archive uses the series' defined components.
-        archive = self.factory.makeArchive()
+        archive = self.factory.makeArchive(purpose=ArchivePurpose.PRIMARY)
         self.assertEquals(
             0, archive.getComponentsForSeries(self.series).count())
 
@@ -1482,3 +1482,11 @@
         self.assertEquals(
             [partner_comp],
             list(archive.getComponentsForSeries(self.series)))
+
+    def test_component_for_ppas(self):
+        # PPAs only use 'main'.
+        archive = self.factory.makeArchive(purpose=ArchivePurpose.PPA)
+        ComponentSelection(distroseries=self.series, component=self.comp1)
+        main_comp = getUtility(IComponentSet)['main']
+        self.assertEquals(
+            [main_comp], list(archive.getComponentsForSeries(self.series)))