Merge lp:~jelmer/launchpad/stable-fix into lp:launchpad/db-devel

[Jelmer Vernooij]

Manual merge of stable.

Merge of the stable branch, with conflicts resolved.

[Edwin Grubbs (edwin-grubbs)]

Hi Jelmer,

The merge looks good, but there are a bunch of lint errors. There are also dangling whitespace and tab characters that lint doesn't warn you about, since that is normally picked up by the user's editor configuration.

-Edwin

configure.zcml has tab-characters instead of spaces and dangling
whitespace at the end of lines.

test_archive.py has a lot of dangling whitespace.

archive.py has dangling whitespace.

== Pyflakes notices ==

lib/lp/soyuz/tests/test_archive.py
    133: local variable 'gedit_main_src_hist' is assigned to but never used

== Pylint notices ==

lib/lp/soyuz/interfaces/archive.py
    502: [C0301] Line too long (79/78)

lib/lp/soyuz/tests/test_archive.py
    789: [C0301] Line too long (79/78)

lib/lp/soyuz/tests/test_processor.py
    30: [C0301] Line too long (79/78)
    37: [C0301] Line too long (79/78)
    39: [C0301] Line too long (79/78)

review: Approve

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-06-25 15:03:10 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-06-30 17:52:31 +0000
@@ -78,6 +78,7 @@
 from lp.soyuz.interfaces.packageset import IPackagesetSet
 from lp.registry.interfaces.person import IPersonSet, PersonVisibility
 from lp.registry.interfaces.pocket import PackagePublishingPocket
+from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import (
     active_publishing_status, inactive_publishing_status, IPublishingSet,
     PackagePublishingStatus)
@@ -1874,10 +1875,12 @@
 
     field_names = ['enabled', 'private', 'commercial', 'require_virtualized',
                    'buildd_secret', 'authorized_size', 'relative_build_score',
-                   'external_dependencies', 'arm_builds_allowed']
+                   'external_dependencies']
 
     custom_widget('external_dependencies', TextAreaWidget, height=3)
 
+    custom_widget('enabled_restricted_families', LabeledMultiCheckBoxWidget)
+
     def validate_save(self, action, data):
         """Validate the save action on ArchiveAdminView.
 
@@ -1956,6 +1959,31 @@
         """
         return self.context.owner.visibility == PersonVisibility.PRIVATE
 
+    def setUpFields(self):
+        """Override `LaunchpadEditFormView`.
+
+        See `createEnabledRestrictedFamilies` method.
+        """
+        super(ArchiveAdminView, self).setUpFields()
+        self.form_fields += self.createEnabledRestrictedFamilies()
+
+    def createEnabledRestrictedFamilies(self):
+        """Creates the 'enabled_restricted_families' field.
+
+        """
+        terms = []
+        for family in getUtility(IProcessorFamilySet).getRestricted():
+            terms.append(SimpleTerm(
+                family, token=family.name, title=family.title))
+        return form.Fields(
+            List(__name__='enabled_restricted_families',
+                 title=_('Enabled restricted families'),
+                 value_type=Choice(vocabulary=SimpleVocabulary(terms)),
+                 required=False,
+                 description=_('Select the restricted architecture families '
+                               'on which this archive is allowed to build.')),
+                 render_context=self.render_context)
+
 
 class ArchiveDeleteView(LaunchpadFormView):
     """View class for deleting `IArchive`s"""

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-06-21 19:29:34 +0000
+++ lib/lp/soyuz/configure.zcml	2010-06-30 17:52:31 +0000
@@ -405,7 +405,8 @@
             set_attributes="description displayname publish status"/>
         <require
             permission="launchpad.Commercial"
-            set_attributes="authorized_size buildd_secret arm_builds_allowed
+            set_attributes="authorized_size buildd_secret
+                            enabled_restricted_families
                             commercial external_dependencies private
                             require_virtualized relative_build_score "/>
         <require

=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2010-06-25 15:03:10 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2010-06-30 17:52:31 +0000
@@ -56,6 +56,7 @@
 from canonical.launchpad.interfaces.launchpad import IPrivacy
 from lp.registry.interfaces.role import IHasOwner
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
+from lp.soyuz.interfaces.processor import IProcessorFamily
 from lp.registry.interfaces.gpg import IGPGKey
 from lp.registry.interfaces.person import IPerson
 from canonical.launchpad.validators.name import name_validator
@@ -368,8 +369,11 @@
             "context build.\n"
             "NOTE: This is for migration of OEM PPAs only!"))
 
-    arm_builds_allowed = Bool(
-        title=_("Allow ARM builds for this archive"))
+    enabled_restricted_families = CollectionField(
+            title=_("Restricted architecture families this archive can build "
+                    "on"),
+            value_type=Reference(schema=IProcessorFamily),
+            readonly=False)
 
     commercial = exported(
         Bool(

=== modified file 'lib/lp/soyuz/interfaces/processor.py'
--- lib/lp/soyuz/interfaces/processor.py	2010-02-24 15:13:10 +0000
+++ lib/lp/soyuz/interfaces/processor.py	2010-06-30 17:52:31 +0000
@@ -55,6 +55,12 @@
         :return: A `IProcessorFamily` instance if found, None otherwise.
         """
 
+    def getRestricted():
+        """Return a sequence of all restricted architectures.
+
+        :return: A sequence of `IProcessorFamily` instances.
+        """
+
     def getByProcessorName(name):
         """Given a processor name return the ProcessorFamily it belongs to.
 

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-06-29 09:37:26 +0000
+++ lib/lp/soyuz/model/archive.py	2010-06-30 17:52:31 +0000
@@ -1590,6 +1590,24 @@
             LibraryFileContent.id == LibraryFileAlias.contentID).config(
                 distinct=True))
 
+    def _get_enabled_restricted_families(self):
+        archive_arch_set = getUtility(IArchiveArchSet)
+        restricted_families = archive_arch_set.getRestrictedfamilies(self)
+        return [family for (family, archive_arch) in restricted_families
+                if archive_arch is not None]
+
+    def _set_enabled_restricted_families(self, value):
+        archive_arch_set = getUtility(IArchiveArchSet)
+        restricted_families = archive_arch_set.getRestrictedfamilies(self)
+        for (family, archive_arch) in restricted_families:
+            if family in value and archive_arch is None:
+                archive_arch_set.new(self, family)
+            if family not in value and archive_arch is not None:
+                Store.of(self).remove(archive_arch)
+
+    enabled_restricted_families = property(_get_enabled_restricted_families,
+                                           _set_enabled_restricted_families)
+
 
 class ArchiveSet:
     implements(IArchiveSet)

=== modified file 'lib/lp/soyuz/model/processor.py'
--- lib/lp/soyuz/model/processor.py	2010-02-24 16:14:37 +0000
+++ lib/lp/soyuz/model/processor.py	2010-06-30 17:52:31 +0000
@@ -59,6 +59,11 @@
         rset = store.find(ProcessorFamily, ProcessorFamily.name == name)
         return rset.one()
 
+    def getRestricted(self):
+        """See `IProcessorFamilySet`."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        return store.find(ProcessorFamily, ProcessorFamily.restricted == True)
+
     def getByProcessorName(self, name):
         """Please see `IProcessorFamilySet`."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-06-25 15:03:10 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-06-30 17:52:31 +0000
@@ -739,14 +739,15 @@
         self.assertCount(3, self.archive, self.bpr_2, day, self.australia)
 
 
-class TestARMBuildsAllowed(TestCaseWithFactory):
-    """Ensure that ARM builds can be allowed and disallowed correctly."""
+class TestEnabledRestrictedBuilds(TestCaseWithFactory):
+    """Ensure that restricted architecture family builds can be allowed and
+    disallowed correctly."""
 
     layer = LaunchpadZopelessLayer
 
     def setUp(self):
         """Setup an archive with relevant publications."""
-        super(TestARMBuildsAllowed, self).setUp()
+        super(TestEnabledRestrictedBuilds, self).setUp()
         self.publisher = SoyuzTestPublisher()
         self.publisher.prepareBreezyAutotest()
         self.archive = self.factory.makeArchive()
@@ -754,41 +755,44 @@
         self.arm = getUtility(IProcessorFamilySet).getByName('arm')
 
     def test_default(self):
-        """By default, ARM builds are not allowed."""
+        """By default, ARM builds are not allowed as ARM is restricted."""
         self.assertEquals(0,
             self.archive_arch_set.getByArchive(
                 self.archive, self.arm).count())
-        self.assertFalse(self.archive.arm_builds_allowed)
+        self.assertEquals([], list(self.archive.enabled_restricted_families))
 
     def test_get_uses_archivearch(self):
         """Adding an entry to ArchiveArch for ARM and an archive will
-        enable arm_builds_allowed for that archive."""
-        self.assertFalse(self.archive.arm_builds_allowed)
+        enable enabled_restricted_families for arm for that archive."""
+        self.assertEquals([], list(self.archive.enabled_restricted_families))
         self.archive_arch_set.new(self.archive, self.arm)
-        self.assertTrue(self.archive.arm_builds_allowed)
+        self.assertEquals([self.arm],
+                list(self.archive.enabled_restricted_families))
 
-    def test_get_uses_arm_only(self):
-        """Adding an entry to ArchiveArch for something other than ARM
-        does not enable arm_builds_allowed for that archive."""
-        self.assertFalse(self.archive.arm_builds_allowed)
+    def test_get_returns_restricted_only(self):
+        """Adding an entry to ArchiveArch for something that is not
+        restricted does not make it show up in enabled_restricted_families.
+        """
+        self.assertEquals([], list(self.archive.enabled_restricted_families))
         self.archive_arch_set.new(self.archive,
             getUtility(IProcessorFamilySet).getByName('amd64'))
-        self.assertFalse(self.archive.arm_builds_allowed)
+        self.assertEquals([], list(self.archive.enabled_restricted_families))
 
     def test_set(self):
         """The property remembers its value correctly and sets ArchiveArch."""
-        self.archive.arm_builds_allowed = True
+        self.archive.enabled_restricted_families = [self.arm]
         allowed_restricted_families = self.archive_arch_set.getByArchive(
             self.archive, self.arm)
         self.assertEquals(1, allowed_restricted_families.count())
         self.assertEquals(self.arm,
             allowed_restricted_families[0].processorfamily)
-        self.assertTrue(self.archive.arm_builds_allowed)
-        self.archive.arm_builds_allowed = False
+        self.assertEquals([self.arm], self.archive.enabled_restricted_families)
+        self.archive.enabled_restricted_families = []
         self.assertEquals(0,
             self.archive_arch_set.getByArchive(
                 self.archive, self.arm).count())
-        self.assertFalse(self.archive.arm_builds_allowed)
+        self.assertEquals([], list(self.archive.enabled_restricted_families))
+
 
 class TestArchiveTokens(TestCaseWithFactory):
     layer = LaunchpadZopelessLayer

=== modified file 'lib/lp/soyuz/tests/test_processor.py'
--- lib/lp/soyuz/tests/test_processor.py	2010-02-25 17:07:38 +0000
+++ lib/lp/soyuz/tests/test_processor.py	2010-06-30 17:52:31 +0000
@@ -30,3 +30,13 @@
         proc = family.addProcessor("avr2001", "The 2001 AVR", "Fast as light.")
         self.assertProvides(proc, IProcessor)
         self.assertEquals(family, proc.family)
+
+    def test_get_restricted(self):
+        """Test retrieving all restricted processors."""
+        family_set = getUtility(IProcessorFamilySet)
+        normal_family = getUtility(IProcessorFamilySet).new("avr", "Atmel AVR",
+            "The Modified Harvard architecture 8-bit RISC processors.")
+        restricted_family = getUtility(IProcessorFamilySet).new("5051", "5051",
+            "Another small processor family", restricted=True)
+        self.assertFalse(normal_family in family_set.getRestricted())
+        self.assertTrue(restricted_family in family_set.getRestricted())