Merge lp:~michael.nelson/launchpad/506292-binarypackagebuild-rename into lp:launchpad

[Michael Nelson]

Rename soyuz's Build class (and interface/sets) to BinaryPackageBuild.

This branch renames the soyuz Build class (and it's interfaces, sets) to BinaryPackageBuild.

It ensures that the API resource_type is still #build for the moment just to ensure there are no changes to the API.

I'm not expecting a normal review, but bigjools will take a quick look and rs it if he's happy with it.

[Julian Edwards (julian-edwards)]

rubber stamped!

review: Approve (code rs)

=== modified file 'lib/canonical/launchpad/database/__init__.py'
--- lib/canonical/launchpad/database/__init__.py	2010-03-05 13:52:32 +0000
+++ lib/canonical/launchpad/database/__init__.py	2010-04-13 06:59:32 +0000
@@ -20,7 +20,7 @@
 from lp.soyuz.model.distroarchseriesbinarypackage import *
 from lp.soyuz.model.distroarchseriesbinarypackagerelease import *
 from lp.soyuz.model.processor import *
-from lp.soyuz.model.build import *
+from lp.soyuz.model.binarypackagebuild import *
 from lp.buildmaster.model.builder import *
 from lp.soyuz.model.publishing import *
 from lp.soyuz.model.files import *
 
=== modified file 'lib/canonical/launchpad/interfaces/__init__.py'
--- lib/canonical/launchpad/interfaces/__init__.py	2010-03-05 13:52:32 +0000
+++ lib/canonical/launchpad/interfaces/__init__.py	2010-04-13 06:59:32 +0000
@@ -42,7 +42,7 @@
 from lp.bugs.interfaces.bugtarget import *
 from lp.bugs.interfaces.bugtracker import *
 from lp.bugs.interfaces.bugwatch import *
-from lp.soyuz.interfaces.build import *
+from lp.soyuz.interfaces.binarypackagebuild import *
 from lp.buildmaster.interfaces.builder import *
 from lp.soyuz.interfaces.buildrecords import *
 from lp.registry.interfaces.codeofconduct import *
 
=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-04-06 20:17:04 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-04-13 06:59:32 +0000
@@ -32,7 +32,7 @@
 from lp.bugs.interfaces.bugtracker import IBugTracker
 from lp.bugs.interfaces.bugwatch import IBugWatch
 from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.soyuz.interfaces.build import IBuild
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuild
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.blueprints.interfaces.specification import ISpecification
 from lp.blueprints.interfaces.specificationbranch import (
@@ -165,7 +165,7 @@
         'params']['build_state'].vocabulary = BuildStatus
 IHasBuildRecords['getBuildRecords'].queryTaggedValue(
     LAZR_WEBSERVICE_EXPORTED)[
-        'return_type'].value_type.schema = IBuild
+        'return_type'].value_type.schema = IBinaryPackageBuild
 
 ISourcePackage['distroseries'].schema = IDistroSeries
 ISourcePackage['productseries'].schema = IProductSeries
@@ -185,7 +185,8 @@
 
 # publishing.py
 ISourcePackagePublishingHistoryPublic['getBuilds'].queryTaggedValue(
-    LAZR_WEBSERVICE_EXPORTED)['return_type'].value_type.schema = IBuild
+    LAZR_WEBSERVICE_EXPORTED)['return_type'].value_type.schema = (
+        IBinaryPackageBuild)
 ISourcePackagePublishingHistoryPublic[
     'getPublishedBinaries'].queryTaggedValue(
         LAZR_WEBSERVICE_EXPORTED)[
 
=== modified file 'lib/canonical/launchpad/security.py'
--- lib/canonical/launchpad/security.py	2010-03-25 08:48:14 +0000
+++ lib/canonical/launchpad/security.py	2010-04-13 06:59:32 +0000
@@ -73,7 +73,7 @@
 from lp.translations.interfaces.potemplate import IPOTemplate
 from lp.soyuz.interfaces.binarypackagerelease import (
     IBinaryPackageReleaseDownloadCount)
-from lp.soyuz.interfaces.build import IBuild
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuild
 from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, IPublishingEdit,
@@ -1436,12 +1436,12 @@
 
 
 class AdminBuildRecord(AdminByBuilddAdmin):
-    usedfor = IBuild
+    usedfor = IBinaryPackageBuild
 
 
 class EditBuildRecord(AdminByBuilddAdmin):
     permission = 'launchpad.Edit'
-    usedfor = IBuild
+    usedfor = IBinaryPackageBuild
 
     def checkAuthenticated(self, user):
         """Check write access for user and different kinds of archives.
@@ -1476,8 +1476,9 @@
 class ViewBuildRecord(EditBuildRecord):
     permission = 'launchpad.View'
 
-    # This code MUST match the logic in IBuildSet.getBuildsForBuilder()
-    # otherwise users are likely to get 403 errors, or worse.
+    # This code MUST match the logic in
+    # IBinaryPackageBuildSet.getBuildsForBuilder() otherwise users are
+    # likely to get 403 errors, or worse.
     def checkAuthenticated(self, user):
         """Private restricts to admins and archive members."""
         if not self.obj.archive.private:
@@ -1518,7 +1519,7 @@
     """Permission to view an `IBuildFarmJob`.
 
     This permission is based entirely on permission to view the
-    associated `IBuild` and/or `IBranch`.
+    associated `IBinaryPackageBuild` and/or `IBranch`.
     """
     permission = 'launchpad.View'
     usedfor = IBuildFarmJob
@@ -2176,7 +2177,8 @@
     usedfor = IBinaryPackagePublishingHistory
 
 
-class ViewBinaryPackageReleaseDownloadCount(ViewSourcePackagePublishingHistory):
+class ViewBinaryPackageReleaseDownloadCount(
+    ViewSourcePackagePublishingHistory):
     """Restrict viewing of binary package download counts."""
     usedfor = IBinaryPackageReleaseDownloadCount
 
 
=== modified file 'lib/canonical/launchpad/webapp/configure.zcml'
--- lib/canonical/launchpad/webapp/configure.zcml	2010-03-23 19:07:44 +0000
+++ lib/canonical/launchpad/webapp/configure.zcml	2010-04-13 06:59:32 +0000
@@ -62,7 +62,7 @@
     <!-- lazr.batchnavigator hook -->
     <adapter
         factory='.batching.FiniteSequenceAdapter' />
-    
+
     <adapter
         factory='.batching.FiniteSequenceAdapter'
         for='storm.zope.interfaces.ISQLObjectResultSet' />
@@ -216,7 +216,7 @@
         />
 
     <adapter
-        for="lp.soyuz.interfaces.build.IBuild"
+        for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         provides="zope.traversing.interfaces.IPathAdapter"
         factory="canonical.launchpad.webapp.tales.BuildImageDisplayAPI"
         name="image"
 
=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py	2010-03-06 04:57:40 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py	2010-04-13 06:59:32 +0000
@@ -39,7 +39,7 @@
     IBinaryPackageNameSet)
 from lp.soyuz.interfaces.binarypackagerelease import (
     BinaryPackageFormat)
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.component import IComponentSet
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from lp.soyuz.interfaces.queue import (
@@ -817,7 +817,7 @@
                     status=BuildStatus.FULLYBUILT)
                 self.logger.debug("Build %s created" % build.id)
         else:
-            build = getUtility(IBuildSet).getByBuildID(build_id)
+            build = getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
             self.logger.debug("Build %s found" % build.id)
             # Ensure gathered binary is related to a FULLYBUILT build
             # record. It will be check in slave-scanner procedure to
 
=== modified file 'lib/lp/archiveuploader/tests/test_securityuploads.py'
--- lib/lp/archiveuploader/tests/test_securityuploads.py	2010-01-07 06:29:36 +0000
+++ lib/lp/archiveuploader/tests/test_securityuploads.py	2010-04-13 06:59:32 +0000
@@ -14,7 +14,7 @@
     TestUploadProcessorBase)
 from lp.archiveuploader.uploadprocessor import UploadProcessor
 from lp.registry.interfaces.pocket import PackagePublishingPocket
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.processor import ProcessorFamily
 from canonical.launchpad.interfaces import (
     IDistributionSet, PackageUploadStatus)
@@ -73,7 +73,7 @@
         # Set up the uploadprocessor with appropriate options and logger
         self.uploadprocessor = UploadProcessor(
             self.options, self.layer.txn, self.log)
-        self.builds_before_upload = Build.select().count()
+        self.builds_before_upload = BinaryPackageBuild.select().count()
         self.source_queue = None
         self._uploadSource()
         self.log.lines = []
@@ -81,7 +81,7 @@
 
     def assertBuildsCreated(self, amount):
         """Assert that a given 'amount' of build records was created."""
-        builds_count = Build.select().count()
+        builds_count = BinaryPackageBuild.select().count()
         self.assertEqual(
             self.builds_before_upload + amount, builds_count)
 
 
=== modified file 'lib/lp/buildmaster/doc/buildqueue.txt'
--- lib/lp/buildmaster/doc/buildqueue.txt	2010-03-07 04:06:22 +0000
+++ lib/lp/buildmaster/doc/buildqueue.txt	2010-04-13 06:59:32 +0000
@@ -31,8 +31,8 @@
 The IBuild record related to this job is provided by the 'build'
 attribute:
 
-    >>> from lp.soyuz.interfaces.build import IBuildSet
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bq)
+    >>> from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bq)
     >>> build.id
     8
     >>> build.buildstate.name
@@ -124,7 +124,7 @@
     True
     >>> print job.logtail
     Dummy sampledata entry, not processing
-    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
     >>> print build.buildstate.name
     BUILDING
     >>> print job.lastscore
@@ -255,8 +255,8 @@
 Note that the results are ordered by descending BuildQueue.lastscore
 and restricted
 
-    >>> for bq in getUtility(IBuildSet).calculateCandidates(archseries):
-    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
+    >>> for bq in getUtility(IBinaryPackageBuildSet).calculateCandidates(archseries):
+    ...     build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
     i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE (1000, 2)
@@ -287,8 +287,8 @@
 The fake language pack will be queued behind the other source packages
 as intended.
 
-    >>> for bq in getUtility(IBuildSet).calculateCandidates(archseries):
-    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
+    >>> for bq in getUtility(IBinaryPackageBuildSet).calculateCandidates(archseries):
+    ...     build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
     i386 build of alsa-utils 1.0.9a-4ubuntu1 in ubuntu hoary RELEASE (1000, 2)
@@ -299,8 +299,8 @@
 Restricting the domain to only hoary/hppa:
 
     >>> archseries = [hoary['hppa']]
-    >>> for bq in getUtility(IBuildSet).calculateCandidates(archseries):
-    ...     build = getUtility(IBuildSet).getByQueueEntry(bq)
+    >>> for bq in getUtility(IBinaryPackageBuildSet).calculateCandidates(archseries):
+    ...     build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bq)
     ...     print "%s (%s, %d)" % (build.title, bq.lastscore, bq.id)
     hppa build of pmount 0.1-2 in ubuntu hoary RELEASE (1500, 4)
     hppa build of alsa-utils 1.0.9a-4 in ubuntu hoary RELEASE (500, 3)
@@ -308,12 +308,12 @@
 This method asserts a valid 'archseries' argument, None or an empty
 list will result in a AssertionFailure.
 
-    >>> getUtility(IBuildSet).calculateCandidates(None).count()
+    >>> getUtility(IBinaryPackageBuildSet).calculateCandidates(None).count()
     Traceback (most recent call last):
     ...
     AssertionError: Given 'archseries' cannot be None/empty.
 
-    >>> getUtility(IBuildSet).calculateCandidates([]).count()
+    >>> getUtility(IBinaryPackageBuildSet).calculateCandidates([]).count()
     Traceback (most recent call last):
     ...
     AssertionError: Given 'archseries' cannot be None/empty.
 
=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2010-04-12 05:52:01 +0000
+++ lib/lp/buildmaster/model/builder.py	2010-04-13 06:59:32 +0000
@@ -55,7 +55,7 @@
 # XXX Michael Nelson 2010-01-13 bug=491330
 # These dependencies on soyuz will be removed when getBuildRecords()
 # is moved.
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.model.buildpackagejob import BuildPackageJob
 
@@ -428,7 +428,7 @@
     def getBuildRecords(self, build_state=None, name=None, arch_tag=None,
                         user=None):
         """See IHasBuildRecords."""
-        return getUtility(IBuildSet).getBuildsForBuilder(
+        return getUtility(IBinaryPackageBuildSet).getBuildsForBuilder(
             self.id, build_state, name, arch_tag, user)
 
     def slaveStatus(self):
@@ -695,7 +695,7 @@
         """See `IBuilderSet`."""
         # Avoiding circular imports.
         from lp.soyuz.model.archive import Archive
-        from lp.soyuz.model.build import Build
+        from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
         from lp.soyuz.model.distroarchseries import (
             DistroArchSeries)
         from lp.soyuz.model.processor import Processor
@@ -703,7 +703,7 @@
         store = Store.of(processor)
         origin = (
             Archive,
-            Build,
+            BinaryPackageBuild,
             BuildPackageJob,
             BuildQueue,
             DistroArchSeries,
@@ -712,11 +712,11 @@
         queue = store.using(*origin).find(
             BuildQueue,
             BuildPackageJob.job == BuildQueue.jobID,
-            BuildPackageJob.build == Build.id,
-            Build.distroarchseries == DistroArchSeries.id,
-            Build.archive == Archive.id,
+            BuildPackageJob.build == BinaryPackageBuild.id,
+            BinaryPackageBuild.distroarchseries == DistroArchSeries.id,
+            BinaryPackageBuild.archive == Archive.id,
             DistroArchSeries.processorfamilyID == Processor.familyID,
-            Build.buildstate == BuildStatus.NEEDSBUILD,
+            BinaryPackageBuild.buildstate == BuildStatus.NEEDSBUILD,
             Archive._enabled == True,
             Processor.id == processor.id,
             Archive.require_virtualized == virtualized,
 
=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py	2010-03-06 04:57:40 +0000
+++ lib/lp/buildmaster/tests/test_builder.py	2010-04-13 06:59:32 +0000
@@ -18,7 +18,7 @@
 from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.binarypackagebuildbehavior import (
     BinaryPackageBuildBehavior)
@@ -88,7 +88,7 @@
         # Asking frog to find a candidate should give us the joesppa build.
         next_job = removeSecurityProxy(
             self.frog_builder)._findBuildCandidate()
-        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
         self.assertEqual('joesppa', build.archive.name)
 
         # If bob is in a failed state the joesppa build is still
@@ -97,7 +97,7 @@
         self.bob_builder.manual = False
         next_job = removeSecurityProxy(
             self.frog_builder)._findBuildCandidate()
-        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
         self.assertEqual('joesppa', build.archive.name)
 
 
@@ -178,7 +178,7 @@
         # A PPA cannot start a build if it would use 80% or more of the
         # builders.
         next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
-        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
         self.failIfEqual('joesppa', build.archive.name)
 
     def test_findBuildCandidate_first_build_finished(self):
@@ -186,7 +186,7 @@
         # will be the next build candidate.
         self.joe_builds[0].buildstate = BuildStatus.FAILEDTOBUILD
         next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
-        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('joesppa', build.archive.name)
 
 
@@ -198,7 +198,7 @@
         # If a ppa is private it will be able to have parallel builds
         # for the one architecture.
         next_job = removeSecurityProxy(self.builder4)._findBuildCandidate()
-        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('joesppa', build.archive.name)
 
 
@@ -225,7 +225,7 @@
 
         next_job = removeSecurityProxy(
             self.frog_builder)._findBuildCandidate()
-        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('primary', build.archive.name)
         self.failUnlessEqual('gedit', build.sourcepackagerelease.name)
 
@@ -235,7 +235,7 @@
         build.builder = self.frog_builder
         next_job = removeSecurityProxy(
             self.frog_builder)._findBuildCandidate()
-        build = getUtility(IBuildSet).getByQueueEntry(next_job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(next_job)
         self.failUnlessEqual('primary', build.archive.name)
         self.failUnlessEqual('firefox', build.sourcepackagerelease.name)
 
 
=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-19 13:58:27 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py	2010-04-13 06:59:32 +0000
@@ -26,7 +26,7 @@
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.model.processor import ProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
 from lp.testing.fakemethod import FakeMethod
@@ -341,7 +341,7 @@
 
         # First mark all builds in the sample data as already built.
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        sample_data = store.find(Build)
+        sample_data = store.find(BinaryPackageBuild)
         for build in sample_data:
             build.buildstate = BuildStatus.FULLYBUILT
         store.flush()
@@ -637,7 +637,7 @@
 
         # First mark all builds in the sample data as already built.
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        sample_data = store.find(Build)
+        sample_data = store.find(BinaryPackageBuild)
         for build in sample_data:
             build.buildstate = BuildStatus.FULLYBUILT
         store.flush()
@@ -843,7 +843,7 @@
 
         # First mark all builds in the sample data as already built.
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        sample_data = store.find(Build)
+        sample_data = store.find(BinaryPackageBuild)
         for build in sample_data:
             build.buildstate = BuildStatus.FULLYBUILT
         store.flush()
@@ -922,7 +922,7 @@
 
         # First mark all builds in the sample data as already built.
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        sample_data = store.find(Build)
+        sample_data = store.find(BinaryPackageBuild)
         for build in sample_data:
             build.buildstate = BuildStatus.FULLYBUILT
         store.flush()
 
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-04-12 05:52:01 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-04-13 06:59:32 +0000
@@ -7,7 +7,7 @@
 import transaction
 import unittest
 
-from twisted.internet import defer, task, reactor
+from twisted.internet import defer
 from twisted.internet.error import (
     ConnectionClosed, ProcessTerminated, TimeoutError)
 from twisted.python.failure import Failure
@@ -30,7 +30,7 @@
     ResetDispatchResult, buildd_success_result_map)
 from lp.buildmaster.tests.harness import BuilddManagerTestSetup
 from lp.registry.interfaces.distribution import IDistributionSet
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.tests.soyuzbuilddhelpers import BuildingSlave
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 
@@ -509,7 +509,7 @@
         self.assertEqual(job.builder, builder)
         self.assertTrue(job.date_started is not None)
         self.assertEqual(job.job.status, JobStatus.RUNNING)
-        build = getUtility(IBuildSet).getByQueueEntry(job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
         self.assertEqual(build.buildstate, BuildStatus.BUILDING)
         self.assertEqual(job.logtail, logtail)
 
@@ -633,7 +633,7 @@
         job = getUtility(IBuildQueueSet).get(job.id)
         self.assertTrue(job.builder is None)
         self.assertTrue(job.date_started is None)
-        build = getUtility(IBuildSet).getByQueueEntry(job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
         self.assertEqual(build.buildstate, BuildStatus.NEEDSBUILD)
 
     def testScanRescuesJobFromBrokenBuilder(self):
@@ -717,7 +717,7 @@
         builder.builderok = True
 
         job = builder.currentjob
-        build = getUtility(IBuildSet).getByQueueEntry(job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
         self.assertEqual(
             'i386 build of mozilla-firefox 0.9 in ubuntu hoary RELEASE',
             build.title)
@@ -734,7 +734,7 @@
     def assertJobIsClean(self, job_id):
         """Re-fetch the `IBuildQueue` record and check if it's clean."""
         job = getUtility(IBuildQueueSet).get(job_id)
-        build = getUtility(IBuildSet).getByQueueEntry(job)
+        build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
         self.assertEqual('NEEDSBUILD', build.buildstate.name)
         self.assertEqual(None, job.builder)
         self.assertEqual(None, job.date_started)
 
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-04-06 20:17:04 +0000
+++ lib/lp/registry/browser/person.py	2010-04-13 06:59:32 +0000
@@ -173,7 +173,7 @@
     IBranchNamespaceSet, InvalidNamespace)
 from lp.bugs.interfaces.bugtask import IBugTaskSet
 from lp.buildmaster.interfaces.buildbase import BuildStatus
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from canonical.launchpad.interfaces.launchpad import (
     ILaunchpadCelebrities, INotificationRecipientSet, UnknownRecipientError)
 from canonical.launchpad.interfaces.message import (
@@ -5189,7 +5189,7 @@
         the source package release.
         """
         # Calculate all the failed builds with one query.
-        build_set = getUtility(IBuildSet)
+        build_set = getUtility(IBinaryPackageBuildSet)
         package_release_ids = [
             package_release.id for package_release in package_releases]
         all_builds = build_set.getBuildsBySourcePackageRelease(
 
=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2010-04-10 09:24:41 +0000
+++ lib/lp/registry/model/distribution.py	2010-04-13 06:59:32 +0000
@@ -39,7 +39,7 @@
 from lp.bugs.model.bugtarget import (
     BugTargetBase, HasBugHeatMixin, OfficialBugTagTargetMixin)
 from lp.bugs.model.bugtask import BugTask
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.registry.model.distributionmirror import DistributionMirror
 from lp.registry.model.distributionsourcepackage import (
     DistributionSourcePackage)
@@ -81,7 +81,7 @@
 from lp.bugs.interfaces.bugtarget import IHasBugHeat
 from lp.bugs.interfaces.bugtask import (
     BugTaskStatus, UNRESOLVED_BUGTASK_STATUSES)
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.registry.interfaces.distribution import (
     IBaseDistribution, IDerivativeDistribution, IDistribution,
@@ -799,8 +799,9 @@
         arch_ids = DistroArchSeriesSet().getIdsForArchitectures(
             self.architectures, arch_tag)
 
-        # Use the facility provided by IBuildSet to retrieve the records.
-        return getUtility(IBuildSet).getBuildsByArchIds(
+        # Use the facility provided by IBinaryPackageBuildSet to
+        # retrieve the records.
+        return getUtility(IBinaryPackageBuildSet).getBuildsByArchIds(
             arch_ids, build_state, name, pocket)
 
     def getSourcePackageCaches(self, archive=None):
@@ -1058,9 +1059,10 @@
             DistroSeries.status != SeriesStatus.OBSOLETE,
             BinaryPackageRelease.binarypackagename == BinaryPackageName.id,
             DistroArchSeries.distroseries == DistroSeries.id,
-            Build.distroarchseries == DistroArchSeries.id,
-            BinaryPackageRelease.build == Build.id,
-            Build.sourcepackagerelease == SourcePackageRelease.id,
+            BinaryPackageBuild.distroarchseries == DistroArchSeries.id,
+            BinaryPackageRelease.build == BinaryPackageBuild.id,
+            (BinaryPackageBuild.sourcepackagerelease ==
+                SourcePackageRelease.id),
             SourcePackageRelease.sourcepackagename == SourcePackageName.id,
             DistributionSourcePackageCache.sourcepackagename ==
                 SourcePackageName.id,
 
=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2010-04-08 18:40:18 +0000
+++ lib/lp/registry/model/distroseries.py	2010-04-13 06:59:32 +0000
@@ -90,7 +90,7 @@
 from canonical.launchpad.helpers import shortlist
 from lp.soyuz.interfaces.archive import (
     ALLOW_RELEASE_BUILDS, ArchivePurpose, IArchiveSet, MAIN_ARCHIVE_PURPOSES)
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.binarypackagename import (
     IBinaryPackageName)
@@ -1110,8 +1110,9 @@
         arch_ids = DistroArchSeriesSet().getIdsForArchitectures(
             self.architectures, arch_tag)
 
-        # Use the facility provided by IBuildSet to retrieve the records.
-        return getUtility(IBuildSet).getBuildsByArchIds(
+        # Use the facility provided by IBinaryPackageBuildSet to
+        # retrieve the records.
+        return getUtility(IBinaryPackageBuildSet).getBuildsByArchIds(
             arch_ids, build_state, name, pocket)
 
     def createUploadedSourcePackageRelease(
 
=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-03-19 11:13:00 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-04-13 06:59:32 +0000
@@ -29,7 +29,8 @@
 from lp.bugs.model.bugtarget import BugTargetBase, HasBugHeatMixin
 from lp.bugs.model.bugtask import BugTask
 from lp.soyuz.interfaces.archive import IArchiveSet, ArchivePurpose
-from lp.soyuz.model.build import Build, BuildSet
+from lp.soyuz.model.binarypackagebuild import (
+    BinaryPackageBuild, BinaryPackageBuildSet)
 from lp.soyuz.model.distributionsourcepackagerelease import (
     DistributionSourcePackageRelease)
 from lp.soyuz.model.distroseriessourcepackagerelease import (
@@ -530,7 +531,7 @@
         # We re-use the optional-parameter handling provided by BuildSet
         # here, but pass None for the name argument as we've already
         # matched on exact source package name.
-        BuildSet().handleOptionalParamsForBuildQueries(
+        BinaryPackageBuildSet().handleOptionalParamsForBuildQueries(
             condition_clauses, clauseTables, build_state, name=None,
             pocket=pocket, arch_tag=arch_tag)
 
@@ -561,7 +562,7 @@
 
         # End of duplication (see XXX cprov 2006-09-25 above).
 
-        return Build.select(' AND '.join(condition_clauses),
+        return BinaryPackageBuild.select(' AND '.join(condition_clauses),
                             clauseTables=clauseTables, orderBy=orderBy)
 
     @property
 
=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-03-12 06:23:04 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-04-13 06:59:32 +0000
@@ -64,7 +64,8 @@
     ArchivePermissionType, IArchivePermissionSet)
 from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
-from lp.soyuz.interfaces.build import BuildSetStatus, IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import (
+    BuildSetStatus, IBinaryPackageBuildSet)
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.registry.interfaces.series import SeriesStatus
@@ -192,7 +193,7 @@
         except ValueError:
             return None
         try:
-            return getUtility(IBuildSet).getByBuildID(build_id)
+            return getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
         except NotFoundError:
             return None
 
 
=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2010-03-24 07:17:20 +0000
+++ lib/lp/soyuz/browser/build.py	2010-04-13 06:59:32 +0000
@@ -34,14 +34,15 @@
 from canonical.lazr.utils import safe_hasattr
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.services.job.interfaces.job import JobStatus
-from lp.soyuz.interfaces.build import IBuild, IBuildRescoreForm, IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import (
+    IBinaryPackageBuild, IBuildRescoreForm, IBinaryPackageBuildSet)
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
 from lp.soyuz.interfaces.queue import PackageUploadStatus
 
 
 class BuildUrl:
-    """Dynamic URL declaration for IBuild.
+    """Dynamic URL declaration for IBinaryPackageBuild.
 
     When dealing with distribution builds we want to present them
     under IDistributionSourcePackageRelease url:
@@ -74,19 +75,20 @@
 
 
 class BuildNavigation(GetitemNavigation, FileNavigationMixin):
-    usedfor = IBuild
+    usedfor = IBinaryPackageBuild
 
 
 class BuildFacets(StandardLaunchpadFacets):
-    """The links that will appear in the facet menu for an IBuild."""
+    """The links that will appear in the facet menu for an
+    IBinaryPackageBuild."""
     enable_only = ['overview']
 
-    usedfor = IBuild
+    usedfor = IBinaryPackageBuild
 
 
 class BuildContextMenu(ContextMenu):
     """Overview menu for build records """
-    usedfor = IBuild
+    usedfor = IBinaryPackageBuild
 
     links = ['ppa', 'records', 'retry', 'rescore']
 
@@ -123,7 +125,7 @@
 
 
 class BuildBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IBuild`."""
+    """Builds a breadcrumb for an `IBinaryPackageBuild`."""
 
     @property
     def text(self):
@@ -140,8 +142,8 @@
 
 
 class BuildView(LaunchpadView):
-    """Auxiliary view class for IBuild"""
-    __used_for__ = IBuild
+    """Auxiliary view class for IBinaryPackageBuild"""
+    __used_for__ = IBinaryPackageBuild
 
     @property
     def label(self):
@@ -230,9 +232,9 @@
 
 
 class BuildRetryView(BuildView):
-    """View class for retrying `IBuild`s"""
+    """View class for retrying `IBinaryPackageBuild`s"""
 
-    __used_for__ = IBuild
+    __used_for__ = IBinaryPackageBuild
 
     @property
     def label(self):
@@ -293,8 +295,8 @@
 
 
 class CompleteBuild:
-    """Super object to store related IBuild & IBuildQueue."""
-    delegates(IBuild)
+    """Super object to store related IBinaryPackageBuild & IBuildQueue."""
+    delegates(IBinaryPackageBuild)
     def __init__(self, build, buildqueue_record):
         self.context = build
         self._buildqueue_record = buildqueue_record
@@ -320,7 +322,8 @@
 
     prefetched_data = dict()
     build_ids = [build.id for build in builds]
-    results = getUtility(IBuildSet).getQueueEntriesForBuildIDs(build_ids)
+    results = getUtility(IBinaryPackageBuildSet).getQueueEntriesForBuildIDs(
+        build_ids)
     for (buildqueue, _builder, build_job) in results:
         # Get the build's id, 'buildqueue', 'sourcepackagerelease' and
         # 'buildlog' (from the result set) respectively.
 
=== modified file 'lib/lp/soyuz/browser/builder.py'
--- lib/lp/soyuz/browser/builder.py	2010-03-16 05:08:47 +0000
+++ lib/lp/soyuz/browser/builder.py	2010-04-13 06:59:32 +0000
@@ -29,7 +29,7 @@
 from canonical.lazr.utils import smartquote
 from canonical.launchpad import _
 from lp.soyuz.browser.build import BuildRecordsView
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.buildmaster.interfaces.builder import IBuilderSet, IBuilder
 from canonical.launchpad.interfaces.launchpad import NotFoundError
 from canonical.launchpad.webapp import (
@@ -52,7 +52,7 @@
         except ValueError:
             return None
         try:
-            build = getUtility(IBuildSet).getByBuildID(build_id)
+            build = getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
         except NotFoundError:
             return None
         else:
 
=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml	2010-03-22 07:10:45 +0000
+++ lib/lp/soyuz/browser/configure.zcml	2010-04-13 06:59:32 +0000
@@ -335,17 +335,17 @@
         attribute_to_parent="archive"
         urldata="lp.soyuz.browser.archivepermission.ArchivePermissionURL"/>
     <browser:defaultView
-        for="lp.soyuz.interfaces.build.IBuild"
+        for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         name="+index"/>
     <browser:url
-        for="lp.soyuz.interfaces.build.IBuild"
+        for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         urldata="lp.soyuz.browser.build.BuildUrl"/>
     <browser:navigation
         module="lp.soyuz.browser.build"
         classes="
             BuildNavigation"/>
     <browser:pages
-        for="lp.soyuz.interfaces.build.IBuild"
+        for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         class="lp.soyuz.browser.build.BuildView"
         permission="launchpad.View">
         <browser:page
@@ -354,7 +354,7 @@
             template="../templates/build-index.pt"/>
     </browser:pages>
     <browser:pages
-        for="lp.soyuz.interfaces.build.IBuild"
+        for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         class="lp.soyuz.browser.build.BuildRetryView"
         permission="launchpad.Edit">
         <browser:page
@@ -363,7 +363,7 @@
             template="../templates/build-retry.pt"/>
     </browser:pages>
     <browser:pages
-        for="lp.soyuz.interfaces.build.IBuild"
+        for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         class="lp.soyuz.browser.build.BuildRescoringView"
         permission="launchpad.Admin">
         <browser:page
 
=== modified file 'lib/lp/soyuz/browser/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2010-03-08 13:07:07 +0000
+++ lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2010-04-13 06:59:32 +0000
@@ -21,7 +21,7 @@
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.archivepublisher.debversion import Version
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease)
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
@@ -47,7 +47,7 @@
         except ValueError:
             return None
         try:
-            return getUtility(IBuildSet).getByBuildID(build_id)
+            return getUtility(IBinaryPackageBuildSet).getByBuildID(build_id)
         except NotFoundError:
             return None
 
@@ -119,7 +119,7 @@
         :return: a `list` of dictionaries containing 'distroseries' and its
              grouped 'builds' ordered by descending distroseries versions.
         """
-        # Build a local list of `IBuilds` ordered by ascending
+        # Build a local list of `IBinaryPackageBuilds` ordered by ascending
         # 'architecture_tag'.
         cached_builds = sorted(
             self.context.builds, key=operator.attrgetter('arch_tag'))
 
=== modified file 'lib/lp/soyuz/browser/publishing.py'
--- lib/lp/soyuz/browser/publishing.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/browser/publishing.py	2010-04-13 06:59:32 +0000
@@ -18,7 +18,7 @@
 
 from canonical.cachedproperty import cachedproperty
 from canonical.launchpad.browser.librarian import ProxiedLibraryFileAlias
-from lp.soyuz.interfaces.build import BuildSetStatus
+from lp.soyuz.interfaces.binarypackagebuild import BuildSetStatus
 from lp.soyuz.interfaces.packagediff import IPackageDiff
 from lp.soyuz.interfaces.publishing import (
     PackagePublishingStatus, IBinaryPackagePublishingHistory,
 
=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2010-04-13 06:59:32 +0000
@@ -356,13 +356,15 @@
 Let's set some builds appropriately to see the results.
 
     >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
-    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
     >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']
     >>> source = view.filtered_sources[0]
     >>> ignore = source.sourcepackagerelease.createBuild(
     ...     distroarchseries=warty_hppa, archive=view.context,
     ...     pocket=source.pocket)
-    >>> builds = getUtility(IBuildSet).getBuildsForArchive(view.context)
+    >>> builds = getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
+    ...     view.context)
     >>> for build in builds:
     ...     print build.title
     hppa build of cdrkit 1.0 in ubuntu warty RELEASE
 
=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt	2010-03-10 12:50:18 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt	2010-04-13 06:59:32 +0000
@@ -2,7 +2,8 @@
 
     >>> from zope.component import getMultiAdapter, getUtility
     >>> from lp.buildmaster.interfaces.builder import IBuilderSet
-    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
     >>> from canonical.launchpad.webapp.servers import LaunchpadTestRequest
 
     >>> builder = getUtility(IBuilderSet).get(1)
@@ -176,7 +177,7 @@
     >>> print frog.builderok
     True
 
-    >>> build_set = getUtility(IBuildSet)
+    >>> build_set = getUtility(IBinaryPackageBuildSet)
     >>> build = build_set.getByQueueEntry(frog.currentjob)
     >>> print build.title
     i386 build of privacy-test 666 in ubuntutest breezy-autotest RELEASE
 
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-03-24 17:07:08 +0000
+++ lib/lp/soyuz/configure.zcml	2010-04-13 06:59:32 +0000
@@ -406,7 +406,7 @@
         <require
             permission="launchpad.Commercial"
             set_attributes="authorized_size buildd_secret arm_builds_allowed
-                            external_dependencies private 
+                            external_dependencies private
                             require_virtualized relative_build_score "/>
         <require
             permission="launchpad.Admin"
@@ -487,19 +487,19 @@
                 deletePackagesetUploader"/>
     </securedutility>
 
-    <!-- Build -->
+    <!-- BinaryPackageBuild -->
 
     <class
-        class="canonical.launchpad.database.Build">
+        class="lp.soyuz.model.binarypackagebuild.BinaryPackageBuild">
         <require
             permission="launchpad.View"
-            interface="lp.soyuz.interfaces.build.IBuildView"/>
+            interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildView"/>
         <require
             permission="launchpad.Edit"
-            interface="lp.soyuz.interfaces.build.IBuildEdit"/>
+            interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildEdit"/>
         <require
             permission="launchpad.Admin"
-            interface="lp.soyuz.interfaces.build.IBuildAdmin"/>
+            interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildAdmin"/>
 
         <!-- XXX cprov 2005-10-27
 
@@ -507,21 +507,22 @@
 
         <require
             permission="launchpad.Edit"
-            set_attributes="buildlog datebuilt buildduration builder                                                                                                                 buildstate dependencies upload_log"/>
+            set_attributes="buildlog datebuilt buildduration builder
+                            buildstate dependencies upload_log"/>
     </class>
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
-        for="lp.soyuz.interfaces.build.IBuild"
+        for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         factory="lp.soyuz.browser.build.BuildBreadcrumb"
         permission="zope.Public"/>
 
-    <!-- BuildSet -->
+    <!-- BinaryPackageBuildSet -->
 
     <securedutility
-        class="canonical.launchpad.database.BuildSet"
-        provides="lp.soyuz.interfaces.build.IBuildSet">
+        class="lp.soyuz.model.binarypackagebuild.BinaryPackageBuildSet"
+        provides="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildSet">
         <allow
-            interface="lp.soyuz.interfaces.build.IBuildSet"/>
+            interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildSet"/>
     </securedutility>
 
     <!-- DistroArchSeriesBinaryPackage -->
@@ -848,7 +849,7 @@
         <allow
             interface="lp.soyuz.interfaces.buildpackagejob.IBuildPackageJob"/>
     </class>
-    <!-- 
+    <!--
         The registration below is used to discover all build farm job classes
         that implement the `IBuildFarmJob` interface. Please see bug #503839
         for more detail.
 
=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-03-17 05:58:22 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-04-13 06:59:32 +0000
@@ -58,8 +58,9 @@
     >>> import pytz
     >>> bob_the_builder = builder_set.get(1)
     >>> cur_bqueue = bob_the_builder.currentjob
-    >>> from lp.soyuz.interfaces.build import IBuildSet
-    >>> cur_build = getUtility(IBuildSet).getByQueueEntry(cur_bqueue)
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
+    >>> cur_build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(cur_bqueue)
 
 Make sure the job at hand is currently being built.
 
 
=== modified file 'lib/lp/soyuz/doc/build-failedtoupload-workflow.txt'
--- lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2010-03-26 19:22:58 +0000
+++ lib/lp/soyuz/doc/build-failedtoupload-workflow.txt	2010-04-13 06:59:32 +0000
@@ -16,9 +16,10 @@
 buildmaster/slave-scanner code, an build notification will be issued.
 See more information in build-notification.txt file.
 
-  >>> from lp.soyuz.interfaces.build import IBuildSet
+  >>> from lp.soyuz.interfaces.binarypackagebuild import (
+  ...     IBinaryPackageBuildSet)
   >>> from lp.testing.mail_helpers import pop_notifications
-  >>> buildset = getUtility(IBuildSet)
+  >>> buildset = getUtility(IBinaryPackageBuildSet)
 
 Let's use a sampledata build record in FAILEDTOUPLOAD:
 
 
=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
--- lib/lp/soyuz/doc/build-notification.txt	2010-03-26 17:31:48 +0000
+++ lib/lp/soyuz/doc/build-notification.txt	2010-04-13 06:59:32 +0000
@@ -2,9 +2,10 @@
 Build Notification System
 =========================
 
-IBuild instance implements the 'notify' method which sends a status
-report about the current record to the ISourcePackageRelease.creator
-and the package uploader's preferred email address.
+IBinaryPackageBuild instance implements the 'notify' method which sends
+a status report about the current record to the
+ISourcePackageRelease.creator and the package uploader's preferred email
+address.
 
 We rely on get_contact_email_addresses() to DTRT, either use the
 Team.contactaddress of the Launchpad Buildd Celebrity or the
@@ -15,9 +16,10 @@
 All build states are supported by the current implementation, however
 only failures should be reported this time.
 
-  >>> from lp.soyuz.interfaces.build import IBuildSet
+  >>> from lp.soyuz.interfaces.binarypackagebuild import (
+  ...     IBinaryPackageBuildSet)
   >>> from lp.testing.mail_helpers import pop_notifications
-  >>> buildset = getUtility(IBuildSet)
+  >>> buildset = getUtility(IBinaryPackageBuildSet)
 
 To avoid consequences of modified sampledata, specially if we add
 more builds for test we are going to pick a specific build record
 
=== modified file 'lib/lp/soyuz/doc/build.txt'
--- lib/lp/soyuz/doc/build.txt	2010-03-26 19:22:58 +0000
+++ lib/lp/soyuz/doc/build.txt	2010-04-13 06:59:32 +0000
@@ -137,8 +137,9 @@
 If the build does not have any uploads, None is returned:
 
     >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
-    >>> from lp.soyuz.interfaces.build import IBuildSet
-    >>> at_build = getUtility(IBuildSet).getByBuildID(15)
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
+    >>> at_build = getUtility(IBinaryPackageBuildSet).getByBuildID(15)
     >>> print at_build.package_upload
     None
 
@@ -147,7 +148,7 @@
     >>> firefox_build.can_be_retried
     False
 
-    >>> frozen_build = getUtility(IBuildSet).getByBuildID(9)
+    >>> frozen_build = getUtility(IBinaryPackageBuildSet).getByBuildID(9)
     >>> frozen_build.title
     u'i386 build of pmount 0.1-1 in ubuntu warty RELEASE'
     >>> frozen_build.buildstate.title
@@ -155,12 +156,12 @@
     >>> frozen_build.can_be_retried
     False
 
-See section 'AssertionErrors in IBuild' for further documentation about
-consequences of an denied 'retry' action.
+See section 'AssertionErrors in IBinaryPackageBuild' for further
+documentation about consequences of an denied 'retry' action.
 
 Let's retrieve a build record that can be retried.
 
-    >>> active_build = getUtility(IBuildSet).getByBuildID(9)
+    >>> active_build = getUtility(IBinaryPackageBuildSet).getByBuildID(9)
 
     >>> print active_build.title
     i386 build of pmount 0.1-1 in ubuntu warty RELEASE
@@ -235,7 +236,7 @@
 
 In order to call storeUploadLog() again for the same build, we have to
 remove the previously stored 'upload_log'. See the check below in
-'AssertionErrors in IBuild' for more detail.
+'AssertionErrors in IBinaryPackageBuild' for more detail.
 
     >>> login('[e-mail]')
     >>> active_build.upload_log = None
@@ -373,7 +374,7 @@
 Invoke createBinaryPackageRelease with all required arguments.
 
     # Load a build from the samepledata for creating binaries.
-    >>> pmount_build = getUtility(IBuildSet).getByBuildID(19)
+    >>> pmount_build = getUtility(IBinaryPackageBuildSet).getByBuildID(19)
 
     >>> bin = pmount_build.createBinaryPackageRelease(
     ...     binarypackagename, version, summary, description,
@@ -453,7 +454,7 @@
 The BuildSet class gives us some useful ways to consider the
 collection of builds.
 
-    >>> bs = getUtility(IBuildSet)
+    >>> bs = getUtility(IBinaryPackageBuildSet)
 
 We can find builds given a source package release and architecture tag.
 
@@ -461,7 +462,7 @@
     >>> i386_builds.count()
     4
 
-IHasBuildRecords uses a base method provided by IBuildSet,
+IHasBuildRecords uses a base method provided by IBinaryPackageBuildSet,
 getBuildsByArchIds():
 
 It receives list of architectures IDs:
@@ -519,8 +520,8 @@
     ...    bs.getBuildsByArchIds(arch_ids, name='commercialpackage')]
     [('PARTNER', u'i386 build of commercialpackage 1.0-1 in ubuntu breezy-autotest RELEASE')]
 
-`IBuildSet` also provides getStatusSummaryForBuilds which summarizes the
-build status of a set of builds:
+`IBinaryPackageBuildSet` also provides getStatusSummaryForBuilds which
+summarizes the build status of a set of builds:
 
 First we'll define a helper to print the build summary:
 
@@ -543,11 +544,12 @@
 data from the database for a given set of builds:
 
     >>> from storm.expr import In
-    >>> from lp.soyuz.model.build import Build
+    >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
     >>> from canonical.launchpad.webapp.interfaces import (
     ...     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
     >>> store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-    >>> results = list(store.find(Build, In(Build.id, (2,6,7,8))))
+    >>> results = list(store.find(
+    ...     BinaryPackageBuild, In(BinaryPackageBuild.id, (2,6,7,8))))
     >>> rset = removeSecurityProxy(bs)._prefetchBuildData(results)
     >>> def filename_or_none(item):
     ...     if item is not None:
@@ -768,7 +770,7 @@
 if user is not passed then the query runs anonymously which means private
 builds are excluded from anything returned.
 
-Log in as admin to avoid security on IBuild for the moment.
+Log in as admin to avoid security on IBinaryPackageBuild for the moment.
 
     >>> login('[e-mail]')
 
@@ -889,16 +891,16 @@
     4
 
 
-== AssertionErrors in IBuild ==
+== AssertionErrors in IBinaryPackageBuild ==
 
 Build records inserted by gina don't provide calculated_buildstart
 value, since they miss fields used in its calculation.
 
-    >>> gina_build = getUtility(IBuildSet).getByBuildID(10)
+    >>> gina_build = getUtility(IBinaryPackageBuildSet).getByBuildID(10)
     >>> gina_build.title
     u'i386 build of cnews cr.g7-37 in ubuntu warty RELEASE'
 
-even if IBuild.was_built return true:
+even if IBinaryPackageBuild.was_built return true:
 
     >>> gina_build.was_built
     True
@@ -916,10 +918,10 @@
 its result in case of success, i.e., we should not be able to retry a
 build for a released pocket.
 
-All those conditions are controlled by IBuild.can_be_retried() property
-(see above).
+All those conditions are controlled by
+IBinaryPackageBuild.can_be_retried() property (see above).
 
-    >>> failed_build = getUtility(IBuildSet).getByBuildID(6)
+    >>> failed_build = getUtility(IBinaryPackageBuildSet).getByBuildID(6)
 
     >>> failed_build.title
     u'i386 build of foobar 1.0 in ubuntu warty RELEASE'
@@ -963,7 +965,7 @@
 storeUploadLog() refuses to override any previously stored
 'upload_log'.
 
-    >>> failedtoupload_build = getUtility(IBuildSet).getByBuildID(22)
+    >>> failedtoupload_build = getUtility(IBinaryPackageBuildSet).getByBuildID(22)
     >>> print failedtoupload_build.title
     i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE
 
@@ -993,17 +995,17 @@
 
 == Updating build-dependencies line ==
 
-The IBuild.dependencies field is only filled when a build job is
-collected as MANUALDEPWAIT, its content is informed by the
+The IBinaryPackageBuild.dependencies field is only filled when a build
+job is collected as MANUALDEPWAIT, its content is informed by the
 buildd-slave in the apt-dependencies format.
 
-    >>> depwait_build = getUtility(IBuildSet).getByBuildID(12)
+    >>> depwait_build = getUtility(IBinaryPackageBuildSet).getByBuildID(12)
     >>> print depwait_build.dependencies
     cpp (>= 4:4.0.1-3), gcc-4.0 (>= 4.0.1-2)
 
-IBuild.updateDependencies is designed to process this field and
-eliminate dependencies that can be satisfied. It is used as part of the
-auto-depwait processing where all builds marked as MANUALDEPWAIT are
+IBinaryPackageBuild.updateDependencies is designed to process this field
+and eliminate dependencies that can be satisfied. It is used as part of
+the auto-depwait processing where all builds marked as MANUALDEPWAIT are
 re-processed and the ones with empty dependencies are re-queued.
 
 If nothing has changed, which is the case of the current
@@ -1107,7 +1109,7 @@
 It depends on the callsite to decide whether or not to 'retry' a
 build after calling updateDependencies, to encapsulate such decision
 for performing the mentioned  auto-depwait procedure we have a utility
-in IBuildSet called retryDepWaiting().
+in IBinaryPackageBuildSet called retryDepWaiting().
 
     >>> print depwait_build.buildstate.name
     MANUALDEPWAIT
@@ -1125,7 +1127,7 @@
 Then we can run the utility method for the target distroarchseries and
 expect depwait_build to be 'retried' and scored.
 
-    >>> getUtility(IBuildSet).retryDepWaiting(hoaryi386)
+    >>> getUtility(IBinaryPackageBuildSet).retryDepWaiting(hoaryi386)
 
     >>> print depwait_build.buildstate.name
     NEEDSBUILD
@@ -1173,8 +1175,8 @@
 
 == Build record security ==
 
-IBuild's content class is wrapped in a Zope security wrapper that prevents
-access to private builds for unauthorised users.
+IBinaryPackageBuild's content class is wrapped in a Zope security
+wrapper that prevents access to private builds for unauthorised users.
 
 Accessing the cprov builds when logged in as admin will see the records:
 
@@ -1373,7 +1375,7 @@
     datetime.timedelta(0, 3600)
 
 
-== IBuildSet.getBuildsBySourcePackageRelease() ==
+== IBinaryPackageBuildSet.getBuildsBySourcePackageRelease() ==
 
 getBuildsBySourcePackageRelease() will return all the Build records for
 all the SourcePackageRelease IDs passed.
@@ -1481,7 +1483,7 @@
     A call to getBuildsForBuilder returns only those builds that were
     built by the specified builder, ordered by datebuilt DESC:
 
-    >>> frog_builds = getUtility(IBuildSet).getBuildsForBuilder(
+    >>> frog_builds = getUtility(IBinaryPackageBuildSet).getBuildsForBuilder(
     ...     frog_builder.id)
     >>> print_build_details(frog_builds)
     ubuntu-team: i386 build of laterbuildsrc 666 in ubuntutest
 
=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt	2010-04-08 15:29:39 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt	2010-04-13 06:59:32 +0000
@@ -131,8 +131,9 @@
 
     >>> job.id
     2
-    >>> from lp.soyuz.interfaces.build import IBuildSet
-    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
     >>> build.buildstate.name
     'NEEDSBUILD'
     >>> job.builder is None
@@ -172,7 +173,7 @@
     >>> job.builder.id == bob_builder.id
     True
 
-    >>> build = getUtility(IBuildSet).getByQueueEntry(job)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(job)
     >>> build.buildstate.name
     'BUILDING'
 
@@ -209,7 +210,7 @@
 
 The build job's archive requires virtualized builds.
 
-    >>> build = getUtility(IBuildSet).getByQueueEntry(ppa_job)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(ppa_job)
     >>> build.archive.require_virtualized
     True
 
 
=== modified file 'lib/lp/soyuz/doc/buildd-scoring.txt'
--- lib/lp/soyuz/doc/buildd-scoring.txt	2010-02-17 13:01:41 +0000
+++ lib/lp/soyuz/doc/buildd-scoring.txt	2010-04-13 06:59:32 +0000
@@ -260,8 +260,9 @@
     ...     name='test-rebuild')
 
     >>> bqc = setUpBuildQueueEntry(archive=copy)
-    >>> from lp.soyuz.interfaces.build import IBuildSet
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqc)
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqc)
     >>> bqc.score()
     >>> bqc.lastscore
     -10
 
=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-04-12 05:52:01 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-04-13 06:59:32 +0000
@@ -75,14 +75,15 @@
 following states: FAILEDTOBUILD and CHROOTWAIT
 
     >>> from lp.buildmaster.interfaces.builder import IBuilderSet
-    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
     >>> import datetime, pytz
 
     >>> UTC = pytz.timezone('UTC')
 
 We want to get a Build and make BuildQueue items for it:
 
-    >>> a_build = getUtility(IBuildSet).getByBuildID(8)
+    >>> a_build = getUtility(IBinaryPackageBuildSet).getByBuildID(8)
 
 To make testing easier we provide a convenience function to put a BuildQueue
 object into a preset fixed state:
@@ -134,7 +135,7 @@
 
 Do the test execution:
 
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem3)
     >>> a_builder.updateBuild(bqItem3)
     >>> build.builder is not None
     True
@@ -164,7 +165,7 @@
 
 Do the test execution:
 
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem4)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem4)
     >>> a_builder.updateBuild(bqItem4)
     CRITICAL:slave-scanner:***** bob is MANUALDEPWAIT *****
     >>> build.builder is not None
@@ -193,7 +194,7 @@
 
     >>> bqItem5.builder.setSlaveForTesting(
     ...     WaitingSlave('BuildStatus.CHROOTFAIL'))
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem5)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem5)
     >>> a_builder.updateBuild(bqItem5)
     CRITICAL:slave-scanner:***** bob is CHROOTWAIT *****
     >>> build.builder is not None
@@ -232,7 +233,7 @@
     True
     >>> check_mail_sent(last_stub_mail_count)
     False
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem6)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem6)
     >>> print build.buildstate.title
     Pending build
     >>> job = bqItem6.specific_job.job
@@ -341,7 +342,7 @@
 (precisely on binary upload time), the build will be considered
 FAILEDTOUPLOAD:
 
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem10)
     >>> a_builder.updateBuild(bqItem10)
     WARNING:slave-scanner:Build ... upload failed.
     >>> build.builder is not None
@@ -407,9 +408,9 @@
 this case cleanly. We need to set the pocket to updates for this test as its
 uploading to warty.
 
-    >>> bqItem10 = getUtility(IBuildSet).getByBuildID(
+    >>> bqItem10 = getUtility(IBinaryPackageBuildSet).getByBuildID(
     ...     6).queueBuild()
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem10)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem10)
 
 XXX: The pocket attribute is not intended to be changed in regular code, but
 for this test we want to change it on the fly. An alternative would be to add
@@ -482,7 +483,7 @@
     0
     >>> check_mail_sent(last_stub_mail_count)
     False
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem11)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem11)
     >>> print build.buildstate.title
     Pending build
     >>> job = bqItem11.specific_job.job
@@ -498,7 +499,7 @@
 investigate why this build end up built. (should never happen in real
 cases, and even so should be refused when we try to upload it.)
 
-    >>> bqItem12 = getUtility(IBuildSet).getByBuildID(
+    >>> bqItem12 = getUtility(IBinaryPackageBuildSet).getByBuildID(
     ...     2).queueBuild()
     >>> setupBuildQueue(bqItem12, a_builder)
     >>> last_stub_mail_count = len(stub.test_emails)
@@ -519,7 +520,7 @@
 The buildlog is collected and compressed locally using gzip algorithm,
 let's see how this method works:
 
-    >>> bqItem10 = getUtility(IBuildSet).getByBuildID(
+    >>> bqItem10 = getUtility(IBinaryPackageBuildSet).getByBuildID(
     ...     6).queueBuild()
     >>> setupBuildQueue(bqItem10, a_builder)
     >>> bqItem10.builder.setSlaveForTesting(WaitingSlave('BuildStatus.OK'))
@@ -696,7 +697,8 @@
 tests.
 
     >>> current_job = a_builder.currentjob
-    >>> resurrect_build = getUtility(IBuildSet).getByQueueEntry(current_job)
+    >>> resurrect_build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
+    ...     current_job)
     >>> resurrect_build.buildstate = BuildStatus.NEEDSBUILD
     >>> syncUpdate(resurrect_build)
     >>> current_job.builder = None
@@ -708,7 +710,8 @@
 corresponding build record as SUPERSEDED.
 
     >>> old_candidate = removeSecurityProxy(a_builder)._findBuildCandidate()
-    >>> build = getUtility(IBuildSet).getByQueueEntry(old_candidate)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
+    ...     old_candidate)
     >>> print build.buildstate.name
     NEEDSBUILD
 
@@ -772,7 +775,7 @@
 aside to convert these to unit-tests.
 
     >>> naked_build = removeSecurityProxy(
-    ...     getUtility(IBuildSet).getByQueueEntry(new_candidate))
+    ...     getUtility(IBinaryPackageBuildSet).getByQueueEntry(new_candidate))
     >>> original_archive = naked_build.archive
     >>> secure_pub = naked_build.current_source_publication
     >>> commit()
@@ -819,7 +822,8 @@
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser(config.builddmaster.dbuser)
 
-    >>> build = getUtility(IBuildSet).getByQueueEntry(current_job)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
+    ...     current_job)
     >>> print build.buildstate.name
     NEEDSBUILD
 
@@ -1053,7 +1057,8 @@
     >>> commit()
     >>> LaunchpadZopelessLayer.switchDbUser('launchpad')
     >>> login('[e-mail]')
-    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
+    ...     candidate)
     >>> for build_file in build.sourcepackagerelease.files:
     ...     removeSecurityProxy(build_file).libraryfile.restricted = True
     >>> private_ppa = factory.makeArchive(
@@ -1087,7 +1092,7 @@
 archive and not the one from the PPA, which on the absence of ancestry
 defaults to 'universe'.
 
-    >>> build = getUtility(IBuildSet).getByQueueEntry(candidate)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(candidate)
     >>> print build.current_component.name
     main
 
@@ -1312,7 +1317,7 @@
     >>> a_builder.currentjob.destroySelf()
 
     >>> bqItem3 = a_build.queueBuild()
-    >>> build = getUtility(IBuildSet).getByQueueEntry(bqItem3)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(bqItem3)
     >>> removeSecurityProxy(build).pocket = (
     ...     PackagePublishingPocket.UPDATES)
     >>> last_stub_mail_count = len(stub.test_emails)
 
=== modified file 'lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt'
--- lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2009-11-15 19:52:54 +0000
+++ lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt	2010-04-13 06:59:32 +0000
@@ -28,7 +28,7 @@
 
   >>> from lp.soyuz.model.publishing import (
   ...     BinaryPackagePublishingHistory)
-  >>> from lp.soyuz.model.build import Build
+  >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
   >>> from lp.soyuz.model.component import Component
   >>> from lp.soyuz.model.section import Section
   >>> from canonical.database.constants import UTC_NOW
@@ -45,7 +45,7 @@
 
 XXX: noodles 2008-11-05 bug=294585: The dependency on a database id
 needs to be removed.
-  >>> bpr = Build.get(8).createBinaryPackageRelease(
+  >>> bpr = BinaryPackageBuild.get(8).createBinaryPackageRelease(
   ...   binarypackagename=firefox_name.id,
   ...   version="120.6-0",
   ...   summary="Firefox loves lollies",
@@ -86,7 +86,7 @@
 
 XXX: noodles 2008-11-06 bug=294585: The dependency on a database id
 needs to be removed.
-  >>> bpr = Build.get(9).createBinaryPackageRelease(
+  >>> bpr = BinaryPackageBuild.get(9).createBinaryPackageRelease(
   ...   binarypackagename=pmount_name.id,
   ...   version="cr98.34",
   ...   summary="Pmount bakes cakes",
 
=== modified file 'lib/lp/soyuz/doc/gina-multiple-arch.txt'
--- lib/lp/soyuz/doc/gina-multiple-arch.txt	2009-11-15 19:52:54 +0000
+++ lib/lp/soyuz/doc/gina-multiple-arch.txt	2010-04-13 06:59:32 +0000
@@ -9,7 +9,7 @@
     ...     BinaryPackagePublishingHistory,
     ...     EmailAddress,
     ...     BinaryPackageRelease,
-    ...     Build)
+    ...     BinaryPackageBuild)
     >>> from lp.registry.model.person import Person, WikiName
     >>> from lp.registry.model.teammembership import TeamParticipation
     >>> SSPPH = SourcePackagePublishingHistory
@@ -22,7 +22,7 @@
     >>> orig_email_count = EmailAddress.select().count()
     >>> orig_wiki_count = WikiName.select().count()
     >>> orig_bpr_count = BinaryPackageRelease.select().count()
-    >>> orig_build_count = Build.select().count()
+    >>> orig_build_count = BinaryPackageBuild.select().count()
     >>> orig_sbpph_count = SBPPH.select().count()
 
 Create a distribution series and an arch series for dapper:
@@ -142,7 +142,7 @@
 
     >>> print Person.select().count() - orig_person_count
     2
-    >>> print TeamParticipation.select().count() - orig_tp_count 
+    >>> print TeamParticipation.select().count() - orig_tp_count
     2
     >>> print EmailAddress.select().count() - orig_email_count
     2
@@ -153,7 +153,7 @@
 
     >>> BinaryPackageRelease.select().count() - orig_bpr_count
     4
-    >>> Build.select().count() - orig_build_count
+    >>> BinaryPackageBuild.select().count() - orig_build_count
     2
     >>> SBPPH.select().count() - orig_sbpph_count
     4
 
=== modified file 'lib/lp/soyuz/doc/gina.txt'
--- lib/lp/soyuz/doc/gina.txt	2010-04-05 18:18:20 +0000
+++ lib/lp/soyuz/doc/gina.txt	2010-04-13 06:59:32 +0000
@@ -13,7 +13,7 @@
     ...     BinaryPackagePublishingHistory,
     ...     EmailAddress,
     ...     BinaryPackageRelease,
-    ...     Build)
+    ...     BinaryPackageBuild)
     >>> from lp.registry.model.person import Person, WikiName
     >>> from lp.registry.model.teammembership import TeamParticipation
     >>> from lp.registry.interfaces.pocket import (
@@ -28,7 +28,7 @@
     >>> orig_email_count = EmailAddress.select().count()
     >>> orig_wiki_count = WikiName.select().count()
     >>> orig_bpr_count = BinaryPackageRelease.select().count()
-    >>> orig_build_count = Build.select().count()
+    >>> orig_build_count = BinaryPackageBuild.select().count()
     >>> orig_sbpph_count = SBPPH.select().count()
     >>> orig_sspph_main_count = SSPPH.selectBy(
     ...     componentID=1, pocket=PackagePublishingPocket.RELEASE).count()
@@ -338,7 +338,7 @@
 
     >>> BinaryPackageRelease.select().count() - orig_bpr_count
     40
-    >>> Build.select().count() - orig_build_count
+    >>> BinaryPackageBuild.select().count() - orig_build_count
     13
     >>> SBPPH.select().count() - orig_sbpph_count
     46
@@ -526,7 +526,7 @@
     13
     >>> BinaryPackageRelease.select().count() - orig_bpr_count
     40
-    >>> Build.select().count() - orig_build_count
+    >>> BinaryPackageBuild.select().count() - orig_build_count
     13
 
 But the overrides do generate extra publishing entries:
 
=== modified file 'lib/lp/soyuz/doc/queuebuilder.txt'
--- lib/lp/soyuz/doc/queuebuilder.txt	2010-03-24 07:17:20 +0000
+++ lib/lp/soyuz/doc/queuebuilder.txt	2010-04-13 06:59:32 +0000
@@ -22,7 +22,7 @@
     >>> from lp.registry.model.distroseries import DistroSeries
     >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
     >>> from lp.soyuz.interfaces.publishing import PackagePublishingStatus
-    >>> from lp.soyuz.model.build import Build
+    >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
     >>> from lp.soyuz.model.distroarchseries import (
     ...     DistroArchSeries, PocketChroot)
 
@@ -119,7 +119,7 @@
 
 Store current status of the database:
 
-    >>> old_build_ids = [build.id for build in Build.select()]
+    >>> old_build_ids = [build.id for build in BinaryPackageBuild.select()]
     >>> old_job_ids = [build_queue.id for build_queue in BuildQueue.select()]
 
 
@@ -233,7 +233,8 @@
     ...     hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
 
     >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
-    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
     >>> failed_build = pub_failed.sourcepackagerelease.createBuild(
     ...     warty['i386'], PackagePublishingPocket.RELEASE,
     ...     warty.main_archive, status=BuildStatus.FAILEDTOBUILD)
@@ -306,7 +307,7 @@
 
 Check that we only created new Build entries for the new hoary releases:
 
-    >>> new_builds = [build for build in Build.select()
+    >>> new_builds = [build for build in BinaryPackageBuild.select()
     ...               if build.id not in old_build_ids]
     >>> for build in sorted(new_builds, key=operator.attrgetter('id')):
     ...   print build.title
@@ -324,7 +325,7 @@
 
 And have a look at our architecture-independent-source's build:
 
-    >>> arch_indep_build = Build.selectOneBy(
+    >>> arch_indep_build = BinaryPackageBuild.selectOneBy(
     ...     sourcepackagerelease=pub_all.sourcepackagerelease)
 
     >>> print arch_indep_build.title
@@ -347,7 +348,8 @@
 happen in parallel with build creation.
 
     >>> build_queue = active_jobs[0]
-    >>> build = getUtility(IBuildSet).getByQueueEntry(build_queue)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
+    ...     build_queue)
     >>> print build.title
     i386 build of test-buildd 667 in ubuntu hoary RELEASE
     >>> build_queue.lastscore
@@ -364,7 +366,8 @@
 Missing BuildQueue records, resulting from given-back builds, are
 created in the last stage of the queue-builder script.
 
-    >>> given_back_build = getUtility(IBuildSet).getByQueueEntry(build_queue)
+    >>> given_back_build = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
+    ...     build_queue)
     >>> build_queue.destroySelf()
     >>> flush_database_updates()
 
 
=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease.txt'
--- lib/lp/soyuz/doc/sourcepackagerelease.txt	2010-03-20 23:16:42 +0000
+++ lib/lp/soyuz/doc/sourcepackagerelease.txt	2010-04-13 06:59:32 +0000
@@ -61,9 +61,9 @@
 property only returns the non-PPA builds.
 
    >>> from canonical.launchpad.interfaces import IPersonSet
-   >>> from lp.soyuz.model.build import Build
+   >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
    >>> cprov_ppa = getUtility(IPersonSet).getByName('cprov').archive
-   >>> ff_ppa_build = Build.selectBy(
+   >>> ff_ppa_build = BinaryPackageBuild.selectBy(
    ...     archive=cprov_ppa, sourcepackagerelease=spr)
    >>> ff_ppa_build.count()
    1
 
=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2010-04-13 06:59:32 +0000
@@ -39,7 +39,7 @@
   4. A changes file that enumerates all the files in the upload, with
      correct md5 sum and file sizes.
   5. Actual files uploaded that match the ones described in the changes file.
- 
+
  If (1) is not available, the upload silently fails.
  If (2) is not available, the upload silently fails.
  If (3) or (4) is not available, the upload is rejected immediately with
@@ -623,12 +623,12 @@
   >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
   >>> from lp.registry.model.sourcepackagename import SourcePackageName
   >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
-  >>> from lp.soyuz.model.build import Build
+  >>> from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
   >>> from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
   >>> spn = SourcePackageName.selectOneBy(name="baz")
   >>> spr = SourcePackageRelease.selectOneBy(sourcepackagenameID=spn.id)
   >>> spr_id = spr.id
-  >>> builds = Build.selectBy(sourcepackagereleaseID=spr_id)
+  >>> builds = BinaryPackageBuild.selectBy(sourcepackagereleaseID=spr_id)
   >>> len(list(builds))
   0
 
@@ -642,7 +642,7 @@
 
 Check build created
 
-  >>> len(list(Build.selectBy(sourcepackagereleaseID=spr_id)))
+  >>> len(list(BinaryPackageBuild.selectBy(sourcepackagereleaseID=spr_id)))
   1
 
 Upload the i386 binary:
@@ -656,7 +656,8 @@
   >>> from canonical.database.sqlbase import clear_current_connection_cache
   >>> clear_current_connection_cache()
 
-  >>> builds = list(Build.selectBy(sourcepackagereleaseID=spr_id))
+  >>> builds = list(BinaryPackageBuild.selectBy(
+  ...     sourcepackagereleaseID=spr_id))
   >>> len(builds)
   1
   >>> builds[0].buildstate == BuildStatus.FULLYBUILT
 
=== renamed file 'lib/lp/soyuz/interfaces/build.py' => 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/build.py	2010-04-03 03:29:23 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py	2010-04-13 06:59:32 +0000
@@ -3,16 +3,16 @@
 
 # pylint: disable-msg=E0211,E0213
 
-"""Build interfaces."""
+"""BinaryPackageBuild interfaces."""
 
 __metaclass__ = type
 
 __all__ = [
     'BuildSetStatus',
     'CannotBeRescored',
-    'IBuild',
+    'IBinaryPackageBuild',
     'IBuildRescoreForm',
-    'IBuildSet',
+    'IBinaryPackageBuildSet',
     ]
 
 from zope.interface import Interface, Attribute
@@ -38,7 +38,7 @@
     _message_prefix = "Cannot rescore build"
 
 
-class IBuildView(IBuildBase):
+class IBinaryPackageBuildView(IBuildBase):
     """A Build interface for items requiring launchpad.View."""
     id = Int(title=_('ID'), required=True, readonly=True)
 
@@ -151,7 +151,7 @@
         """
 
 
-class IBuildEdit(Interface):
+class IBinaryPackageBuildEdit(Interface):
     """A Build interface for items requiring launchpad.Edit."""
 
     @export_write_operation()
@@ -163,7 +163,7 @@
         """
 
 
-class IBuildAdmin(Interface):
+class IBinaryPackageBuildAdmin(Interface):
     """A Build interface for items requiring launchpad.Admin."""
 
     @operation_parameters(score=Int(title=_("Score"), required=True))
@@ -172,9 +172,11 @@
         """Change the build's score."""
 
 
-class IBuild(IBuildView, IBuildEdit, IBuildAdmin):
+class IBinaryPackageBuild(
+    IBinaryPackageBuildView, IBinaryPackageBuildEdit,
+    IBinaryPackageBuildAdmin):
     """A Build interface"""
-    export_as_webservice_entry()
+    export_as_webservice_entry(singular_name='build', plural_name='builds')
 
 
 class BuildSetStatus(EnumeratedType):
@@ -208,8 +210,8 @@
                     description="There are some builds currently building.")
 
 
-class IBuildSet(Interface):
-    """Interface for BuildSet"""
+class IBinaryPackageBuildSet(Interface):
+    """Interface for BinaryPackageBuildSet"""
 
     def getBuildBySRAndArchtag(sourcepackagereleaseID, archtag):
         """Return a build for a SourcePackageRelease and an ArchTag"""
 
=== modified file 'lib/lp/soyuz/interfaces/buildfarmbuildjob.py'
--- lib/lp/soyuz/interfaces/buildfarmbuildjob.py	2010-03-16 05:08:47 +0000
+++ lib/lp/soyuz/interfaces/buildfarmbuildjob.py	2010-04-13 06:59:32 +0000
@@ -11,11 +11,11 @@
 from canonical.launchpad import _
 from lazr.restful.fields import Reference
 from lp.buildmaster.interfaces.buildfarmjob import IBuildFarmJob
-from lp.soyuz.interfaces.build import IBuild
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuild
 
 
 class IBuildFarmBuildJob(IBuildFarmJob):
     """An `IBuildFarmJob` with an `IBuild` reference."""
     build = Reference(
-        IBuild, title=_("Build"), required=True, readonly=True,
+        IBinaryPackageBuild, title=_("Build"), required=True, readonly=True,
         description=_("Build record associated with this job."))
 
=== modified file 'lib/lp/soyuz/interfaces/buildpackagejob.py'
--- lib/lp/soyuz/interfaces/buildpackagejob.py	2010-03-16 05:08:47 +0000
+++ lib/lp/soyuz/interfaces/buildpackagejob.py	2010-04-13 06:59:32 +0000
@@ -16,7 +16,7 @@
 from canonical.launchpad import _
 from lazr.restful.fields import Reference
 from lp.services.job.interfaces.job import IJob
-from lp.soyuz.interfaces.build import IBuild
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuild
 from lp.soyuz.interfaces.buildfarmbuildjob import IBuildFarmBuildJob
 
 
@@ -30,6 +30,6 @@
         description=_("Data common to all job types."))
 
     build = Reference(
-        IBuild, title=_("Build"),
+        IBinaryPackageBuild, title=_("Build"),
         required=True, readonly=True,
         description=_("Build record associated with this job."))
 
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-04-08 02:35:06 +0000
+++ lib/lp/soyuz/model/archive.py	2010-04-13 06:59:32 +0000
@@ -42,7 +42,7 @@
 from lp.soyuz.model.archivesubscriber import ArchiveSubscriber
 from lp.soyuz.model.binarypackagerelease import (
     BinaryPackageReleaseDownloadCount)
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.distributionsourcepackagecache import (
     DistributionSourcePackageCache)
 from lp.soyuz.model.distroseriespackagecache import DistroSeriesPackageCache
@@ -71,7 +71,7 @@
 from lp.soyuz.interfaces.archivesubscriber import (
     ArchiveSubscriberStatus, IArchiveSubscriberSet, ArchiveSubscriptionError)
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.component import IComponent, IComponentSet
 from lp.registry.interfaces.distroseries import IDistroSeriesSet
@@ -211,7 +211,7 @@
         for (family, archive_arch) in restricted_families:
             if family == arm:
                 return (archive_arch is not None)
-        # ARM doesn't exist or isn't restricted. Either way, there is no 
+        # ARM doesn't exist or isn't restricted. Either way, there is no
         # need for an explicit association.
         return False
 
@@ -358,7 +358,7 @@
         """See IHasBuildRecords"""
         # Ignore "user", since anyone already accessing this archive
         # will implicitly have permission to see it.
-        return getUtility(IBuildSet).getBuildsForArchive(
+        return getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
             self, build_state, name, pocket, arch_tag)
 
     def getPublishedSources(self, name=None, version=None, status=None,
@@ -873,17 +873,19 @@
         store = Store.of(self)
         extra_exprs = []
         if not include_needsbuild:
-            extra_exprs.append(Build.buildstate != BuildStatus.NEEDSBUILD)
+            extra_exprs.append(
+                BinaryPackageBuild.buildstate != BuildStatus.NEEDSBUILD)
 
         find_spec = (
-            Build.buildstate,
-            Count(Build.id)
+            BinaryPackageBuild.buildstate,
+            Count(BinaryPackageBuild.id)
             )
-        result = store.using(Build).find(
+        result = store.using(BinaryPackageBuild).find(
             find_spec,
-            Build.archive == self,
+            BinaryPackageBuild.archive == self,
             *extra_exprs
-            ).group_by(Build.buildstate).order_by(Build.buildstate)
+            ).group_by(BinaryPackageBuild.buildstate).order_by(
+                BinaryPackageBuild.buildstate)
 
         # Create a map for each count summary to a number of buildstates:
         count_map = {
@@ -1137,8 +1139,8 @@
             BinaryPackageRelease,
             BinaryPackageRelease.binarypackagename == name,
             BinaryPackageRelease.version == version,
-            Build.id == BinaryPackageRelease.buildID,
-            DistroArchSeries.id == Build.distroarchseriesID,
+            BinaryPackageBuild.id == BinaryPackageRelease.buildID,
+            DistroArchSeries.id == BinaryPackageBuild.distroarchseriesID,
             DistroArchSeries.architecturetag == archtag,
             BinaryPackagePublishingHistory.archive == self,
             BinaryPackagePublishingHistory.binarypackagereleaseID ==
@@ -1335,12 +1337,13 @@
 
         extra_exprs = []
         if build_status is not None:
-            extra_exprs.append(Build.buildstate == build_status)
+            extra_exprs.append(BinaryPackageBuild.buildstate == build_status)
 
         result_set = store.find(
             SourcePackageRelease,
-            Build.sourcepackagereleaseID == SourcePackageRelease.id,
-            Build.archive == self,
+            (BinaryPackageBuild.sourcepackagereleaseID ==
+                SourcePackageRelease.id),
+            BinaryPackageBuild.archive == self,
             *extra_exprs)
 
         result_set.config(distinct=True).order_by(SourcePackageRelease.id)
 
=== renamed file 'lib/lp/soyuz/model/build.py' => 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/build.py	2010-03-07 04:06:22 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2010-04-13 06:59:32 +0000
@@ -4,7 +4,7 @@
 # pylint: disable-msg=E0611,W0212
 
 __metaclass__ = type
-__all__ = ['Build', 'BuildSet']
+__all__ = ['BinaryPackageBuild', 'BinaryPackageBuildSet']
 
 import apt_pkg
 import datetime
@@ -49,8 +49,9 @@
 from lp.services.job.model.job import Job
 from lp.soyuz.adapters.archivedependencies import get_components_for_building
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import (
-    BuildSetStatus, CannotBeRescored, IBuild, IBuildSet)
+from lp.soyuz.interfaces.binarypackagebuild import (
+    BuildSetStatus, CannotBeRescored, IBinaryPackageBuild,
+    IBinaryPackageBuildSet)
 from lp.buildmaster.interfaces.buildbase import IBuildBase
 from lp.soyuz.interfaces.publishing import active_publishing_status
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
@@ -62,8 +63,8 @@
     PackageUpload, PackageUploadBuild)
 
 
-class Build(BuildBase, SQLBase):
-    implements(IBuildBase, IBuild)
+class BinaryPackageBuild(BuildBase, SQLBase):
+    implements(IBuildBase, IBinaryPackageBuild)
     _table = 'Build'
     _defaultOrder = 'id'
 
@@ -470,7 +471,7 @@
         # Look for all sourcepackagerelease instances that match the name
         # and get the (successfully built) build records for this
         # package.
-        completed_builds = Build.select("""
+        completed_builds = BinaryPackageBuild.select("""
             Build.sourcepackagerelease = SourcePackageRelease.id AND
             Build.id != %s AND
             Build.buildduration IS NOT NULL AND
@@ -693,11 +694,11 @@
         raise NotFoundError(filename)
 
 
-class BuildSet:
-    implements(IBuildSet)
+class BinaryPackageBuildSet:
+    implements(IBinaryPackageBuildSet)
 
     def getBuildBySRAndArchtag(self, sourcepackagereleaseID, archtag):
-        """See `IBuildSet`"""
+        """See `IBinaryPackageBuildSet`"""
         clauseTables = ['DistroArchSeries']
         query = ('Build.sourcepackagerelease = %s '
                  'AND Build.distroarchseries = DistroArchSeries.id '
@@ -705,25 +706,25 @@
                  % sqlvalues(sourcepackagereleaseID, archtag)
                  )
 
-        return Build.select(query, clauseTables=clauseTables)
+        return BinaryPackageBuild.select(query, clauseTables=clauseTables)
 
     def getByBuildID(self, id):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         try:
-            return Build.get(id)
+            return BinaryPackageBuild.get(id)
         except SQLObjectNotFound, e:
             raise NotFoundError(str(e))
 
     def getPendingBuildsForArchSet(self, archseries):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         if not archseries:
             return None
 
         archseries_ids = [d.id for d in archseries]
 
-        return Build.select(
-            AND(Build.q.buildstate==BuildStatus.NEEDSBUILD,
-                IN(Build.q.distroarchseriesID, archseries_ids))
+        return BinaryPackageBuild.select(
+            AND(BinaryPackageBuild.q.buildstate==BuildStatus.NEEDSBUILD,
+                IN(BinaryPackageBuild.q.distroarchseriesID, archseries_ids))
             )
 
     def handleOptionalParamsForBuildQueries(
@@ -775,7 +776,7 @@
 
     def getBuildsForBuilder(self, builder_id, status=None, name=None,
                             arch_tag=None, user=None):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         queries = []
         clauseTables = []
 
@@ -801,12 +802,13 @@
 
         queries.append("builder=%s" % builder_id)
 
-        return Build.select(" AND ".join(queries), clauseTables=clauseTables,
-                            orderBy=["-Build.datebuilt", "id"])
+        return BinaryPackageBuild.select(
+            " AND ".join(queries), clauseTables=clauseTables,
+            orderBy=["-Build.datebuilt", "id"])
 
     def getBuildsForArchive(self, archive, status=None, name=None,
                             pocket=None, arch_tag=None):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         queries = []
         clauseTables = []
 
@@ -828,17 +830,18 @@
         clause = " AND ".join(queries)
 
         return self._decorate_with_prejoins(
-            Build.select(clause, clauseTables=clauseTables, orderBy=orderBy))
+            BinaryPackageBuild.select(
+                clause, clauseTables=clauseTables, orderBy=orderBy))
 
     def getBuildsByArchIds(self, arch_ids, status=None, name=None,
                            pocket=None):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         # If not distroarchseries was found return empty list
         if not arch_ids:
             # XXX cprov 2006-09-08: returning and empty SelectResult to make
             # the callsites happy as bjorn suggested. However it would be
             # much clearer if we have something like SQLBase.empty() for this
-            return Build.select("2=1")
+            return BinaryPackageBuild.select("2=1")
 
         clauseTables = []
 
@@ -894,7 +897,7 @@
                 sqlvalues(ArchivePurpose.PRIMARY, ArchivePurpose.PARTNER)))
 
         return self._decorate_with_prejoins(
-            Build.select(' AND '.join(condition_clauses),
+            BinaryPackageBuild.select(' AND '.join(condition_clauses),
             clauseTables=clauseTables, orderBy=orderBy))
 
     def _decorate_with_prejoins(self, result_set):
@@ -906,12 +909,12 @@
         return decorated_results
 
     def retryDepWaiting(self, distroarchseries):
-        """See `IBuildSet`. """
+        """See `IBinaryPackageBuildSet`. """
         # XXX cprov 20071122: use the root logger once bug 164203 is fixed.
         logger = logging.getLogger('retry-depwait')
 
         # Get the MANUALDEPWAIT records for all archives.
-        candidates = Build.selectBy(
+        candidates = BinaryPackageBuild.selectBy(
             buildstate=BuildStatus.MANUALDEPWAIT,
             distroarchseries=distroarchseries)
 
@@ -937,7 +940,7 @@
 
     def getBuildsBySourcePackageRelease(self, sourcepackagerelease_ids,
                                         buildstate=None):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         if (sourcepackagerelease_ids is None or
             len(sourcepackagerelease_ids) == 0):
             return []
@@ -951,12 +954,12 @@
         if buildstate is not None:
             query += "AND buildstate = %s" % sqlvalues(buildstate)
 
-        return Build.select(
+        return BinaryPackageBuild.select(
             query, orderBy=["-datecreated", "id"],
             clauseTables=["Archive"])
 
     def getStatusSummaryForBuilds(self, builds):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         # Create a small helper function to collect the builds for a given
         # list of build states:
         def collect_builds(*states):
@@ -1024,26 +1027,27 @@
         build_ids = [build.id for build in results]
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
         origin = (
-            Build,
+            BinaryPackageBuild,
             LeftJoin(
                 SourcePackageRelease,
-                SourcePackageRelease.id == Build.sourcepackagereleaseID),
+                (SourcePackageRelease.id ==
+                    BinaryPackageBuild.sourcepackagereleaseID)),
             LeftJoin(
                 SourcePackageName,
                 SourcePackageName.id
                     == SourcePackageRelease.sourcepackagenameID),
             LeftJoin(LibraryFileAlias,
-                     LibraryFileAlias.id == Build.buildlogID),
+                     LibraryFileAlias.id == BinaryPackageBuild.buildlogID),
             LeftJoin(LibraryFileContent,
                      LibraryFileContent.id == LibraryFileAlias.contentID),
             LeftJoin(
                 Builder,
-                Builder.id == Build.builderID),
+                Builder.id == BinaryPackageBuild.builderID),
             )
         result_set = store.using(*origin).find(
             (SourcePackageRelease, LibraryFileAlias, SourcePackageName,
              LibraryFileContent, Builder),
-            In(Build.id, build_ids))
+            In(BinaryPackageBuild.id, build_ids))
 
         # Force query execution so that the ancillary data gets fetched
         # and added to StupidCache.
@@ -1053,36 +1057,38 @@
         return list(result_set)
 
     def getByQueueEntry(self, queue_entry):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
         result_set = store.find(
-            Build,
-            BuildPackageJob.build == Build.id,
+            BinaryPackageBuild,
+            BuildPackageJob.build == BinaryPackageBuild.id,
             BuildPackageJob.job == BuildQueue.jobID,
             BuildQueue.job == queue_entry.job)
 
         return result_set.one()
 
     def getQueueEntriesForBuildIDs(self, build_ids):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
 
         origin = (
             BuildPackageJob,
             Join(BuildQueue, BuildPackageJob.job == BuildQueue.jobID),
-            Join(Build, BuildPackageJob.build == Build.id),
+            Join(
+                BinaryPackageBuild,
+                BuildPackageJob.build == BinaryPackageBuild.id),
             LeftJoin(
                 Builder,
                 BuildQueue.builderID == Builder.id),
             )
         result_set = store.using(*origin).find(
             (BuildQueue, Builder, BuildPackageJob),
-            In(Build.id, build_ids))
+            In(BinaryPackageBuild.id, build_ids))
 
         return result_set
 
     def calculateCandidates(self, archseries):
-        """See `IBuildSet`."""
+        """See `IBinaryPackageBuildSet`."""
         if not archseries:
             raise AssertionError("Given 'archseries' cannot be None/empty.")
 
 
=== modified file 'lib/lp/soyuz/model/binarypackagerelease.py'
--- lib/lp/soyuz/model/binarypackagerelease.py	2010-03-15 23:02:21 +0000
+++ lib/lp/soyuz/model/binarypackagerelease.py	2010-04-13 06:59:32 +0000
@@ -38,7 +38,8 @@
     version = StringCol(dbName='version', notNull=True)
     summary = StringCol(dbName='summary', notNull=True, default="")
     description = StringCol(dbName='description', notNull=True)
-    build = ForeignKey(dbName='build', foreignKey='Build', notNull=True)
+    build = ForeignKey(
+        dbName='build', foreignKey='BinaryPackageBuild', notNull=True)
     binpackageformat = EnumCol(dbName='binpackageformat', notNull=True,
                                schema=BinaryPackageFormat)
     component = ForeignKey(dbName='component', foreignKey='Component',
 
=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-03-25 14:38:25 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-04-13 06:59:32 +0000
@@ -22,7 +22,7 @@
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 
@@ -38,7 +38,7 @@
     job = Reference(job_id, 'Job.id')
 
     build_id = Int(name='build', allow_none=False)
-    build = Reference(build_id, 'Build.id')
+    build = Reference(build_id, 'BinaryPackageBuild.id')
 
     def score(self):
         """See `IBuildPackageJob`."""
@@ -242,7 +242,7 @@
         # Builds in those situation should not be built because they will
         # be wasting build-time, the former case already has a newer source
         # and the latter could not be built in DAK.
-        build_set = getUtility(IBuildSet)
+        build_set = getUtility(IBinaryPackageBuildSet)
 
         build = build_set.getByQueueEntry(job)
         if build.pocket == PackagePublishingPocket.SECURITY:
 
=== modified file 'lib/lp/soyuz/model/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/model/distributionsourcepackagerelease.py	2009-09-18 12:18:51 +0000
+++ lib/lp/soyuz/model/distributionsourcepackagerelease.py	2010-04-13 06:59:32 +0000
@@ -29,7 +29,7 @@
     DistroSeriesBinaryPackage)
 from lp.soyuz.model.publishing import (
     BinaryPackagePublishingHistory)
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.publishing import \
     SourcePackagePublishingHistory
 from lp.soyuz.interfaces.archive import MAIN_ARCHIVE_PURPOSES
@@ -100,8 +100,9 @@
         # distribution that were built for a PPA but have been published
         # in a main archive.
         builds_for_distro_exprs = (
-            Build.sourcepackagerelease == self.sourcepackagerelease,
-            Build.distroarchseries == DistroArchSeries.id,
+            (BinaryPackageBuild.sourcepackagerelease ==
+                self.sourcepackagerelease),
+            BinaryPackageBuild.distroarchseries == DistroArchSeries.id,
             DistroArchSeries.distroseries == DistroSeries.id,
             DistroSeries.distribution == self.distribution,
             )
@@ -109,9 +110,9 @@
         # First, get all the builds built in a main archive (this will
         # include new and failed builds.)
         builds_built_in_main_archives = store.find(
-            Build,
+            BinaryPackageBuild,
             builds_for_distro_exprs,
-            Build.archive == Archive.id,
+            BinaryPackageBuild.archive == Archive.id,
             Archive.purpose.is_in(MAIN_ARCHIVE_PURPOSES))
 
         # Next get all the builds that have a binary published in the
@@ -119,9 +120,9 @@
         # query, but not the new/failed ones. It will also include
         # ppa builds that have been published in main archives.
         builds_published_in_main_archives = store.find(
-            Build,
+            BinaryPackageBuild,
             builds_for_distro_exprs,
-            BinaryPackageRelease.build == Build.id,
+            BinaryPackageRelease.build == BinaryPackageBuild.id,
             BinaryPackagePublishingHistory.binarypackagerelease ==
                 BinaryPackageRelease.id,
             BinaryPackagePublishingHistory.archive == Archive.id,
@@ -130,7 +131,8 @@
 
         return builds_built_in_main_archives.union(
             builds_published_in_main_archives).order_by(
-                Desc(Build.datecreated), Desc(Build.id))
+                Desc(
+                    BinaryPackageBuild.datecreated), Desc(BinaryPackageBuild.id))
 
     @property
     def binary_package_names(self):
 
=== modified file 'lib/lp/soyuz/model/distroarchseries.py'
--- lib/lp/soyuz/model/distroarchseries.py	2010-02-22 10:31:48 +0000
+++ lib/lp/soyuz/model/distroarchseries.py	2010-04-13 06:59:32 +0000
@@ -26,7 +26,7 @@
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageName
 from lp.soyuz.interfaces.binarypackagerelease import IBinaryPackageReleaseSet
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.distroarchseries import (
     IDistroArchSeries, IDistroArchSeriesSet, IPocketChroot)
@@ -240,8 +240,9 @@
         if arch_tag is not None and arch_tag != self.architecturetag:
             return EmptyResultSet()
 
-        # Use the facility provided by IBuildSet to retrieve the records.
-        return getUtility(IBuildSet).getBuildsByArchIds(
+        # Use the facility provided by IBinaryPackageBuildSet to
+        # retrieve the records.
+        return getUtility(IBinaryPackageBuildSet).getBuildsByArchIds(
             [self.id], build_state, name, pocket)
 
     def getReleasedPackages(self, binary_name, pocket=None,
 
=== modified file 'lib/lp/soyuz/model/publishedpackage.py'
--- lib/lp/soyuz/model/publishedpackage.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/model/publishedpackage.py	2010-04-13 06:59:32 +0000
@@ -53,7 +53,7 @@
     binarypackagesummary = StringCol(immutable=True)
     binarypackagedescription = StringCol(immutable=True)
     binarypackageversion = StringCol(immutable=True)
-    build = ForeignKey(foreignKey='Build', dbName='build')
+    build = ForeignKey(foreignKey='BinaryPackageBuild', dbName='build')
     datebuilt = UtcDateTimeCol(immutable=True)
     sourcepackagerelease = ForeignKey(dbName="sourcepackagerelease",
                                       foreignKey="SourcePackageRelease",
 
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-04-03 03:29:23 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-04-13 06:59:32 +0000
@@ -54,7 +54,8 @@
 from lp.soyuz.model.packagediff import PackageDiff
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.archivearch import IArchiveArchSet
-from lp.soyuz.interfaces.build import BuildSetStatus, IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import (
+    BuildSetStatus, IBinaryPackageBuildSet)
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.publishing import (
     active_publishing_status, IBinaryPackageFilePublishing,
@@ -510,19 +511,19 @@
         return the_url
 
     def _getAllowedArchitectures(self, available_archs):
-        """Filter out any restricted architectures not specifically allowed 
+        """Filter out any restricted architectures not specifically allowed
         for an archive.
 
         :param available_archs: Architectures to consider
         :return: Sequence of `IDistroArch` instances.
         """
         associated_proc_families = [
-            archivearch.processorfamily for archivearch 
+            archivearch.processorfamily for archivearch
             in getUtility(IArchiveArchSet).getByArchive(self.archive)]
         # Return all distroarches with unrestricted processor families or with
         # processor families the archive is explicitly associated with.
         return [distroarch for distroarch in available_archs
-            if not distroarch.processorfamily.restricted or 
+            if not distroarch.processorfamily.restricted or
                distroarch.processorfamily in associated_proc_families]
 
     def createMissingBuilds(self, architectures_available=None,
@@ -553,8 +554,8 @@
     def _createMissingBuildForArchitecture(self, arch, logger=None):
         """Create a build for a given architecture if it doesn't exist yet.
 
-        Return the just-created `IBuild` record already scored or None
-        if a suitable build is already present.
+        Return the just-created `IBinaryPackageBuild` record already
+        scored or None if a suitable build is already present.
         """
         build_candidate = self.sourcepackagerelease.getBuildByArch(
             arch, self.archive)
@@ -804,8 +805,8 @@
     datepublished = UtcDateTimeCol(default=None)
     datecreated = UtcDateTimeCol(default=UTC_NOW)
     datesuperseded = UtcDateTimeCol(default=None)
-    supersededby = ForeignKey(foreignKey='Build', dbName='supersededby',
-                              default=None)
+    supersededby = ForeignKey(
+        foreignKey='BinaryPackageBuild', dbName='supersededby', default=None)
     datemadepending = UtcDateTimeCol(default=None)
     dateremoved = UtcDateTimeCol(default=None)
     pocket = EnumCol(dbName='pocket', schema=PackagePublishingPocket)
@@ -1167,7 +1168,7 @@
         # Import Build and DistroArchSeries locally to avoid circular
         # imports, since that Build uses SourcePackagePublishingHistory
         # and DistroArchSeries uses BinaryPackagePublishingHistory.
-        from lp.soyuz.model.build import Build
+        from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
         from lp.soyuz.model.distroarchseries import (
             DistroArchSeries)
 
@@ -1182,41 +1183,43 @@
         # ensure that the result is limited to builds in those states.
         if build_states is not None:
             extra_exprs.append(
-                Build.buildstate.is_in(build_states))
+                BinaryPackageBuild.buildstate.is_in(build_states))
 
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
 
         # We'll be looking for builds in the same distroseries as the
         # SPPH for the same release.
         builds_for_distroseries_expr = (
-            Build.distroarchseriesID == DistroArchSeries.id,
+            BinaryPackageBuild.distroarchseriesID == DistroArchSeries.id,
             SourcePackagePublishingHistory.distroseriesID ==
                 DistroArchSeries.distroseriesID,
             SourcePackagePublishingHistory.sourcepackagereleaseID ==
-                Build.sourcepackagereleaseID,
+                BinaryPackageBuild.sourcepackagereleaseID,
             In(SourcePackagePublishingHistory.id, source_publication_ids)
             )
 
         # First, we'll find the builds that were built in the same
         # archive context as the published sources.
         builds_in_same_archive = store.find(
-            Build,
+            BinaryPackageBuild,
             builds_for_distroseries_expr,
-            SourcePackagePublishingHistory.archiveID == Build.archiveID,
+            (SourcePackagePublishingHistory.archiveID ==
+                BinaryPackageBuild.archiveID),
             *extra_exprs)
 
         # Next get all the builds that have a binary published in the
         # same archive... even though the build was not built in
         # the same context archive.
         builds_copied_into_archive = store.find(
-            Build,
+            BinaryPackageBuild,
             builds_for_distroseries_expr,
-            SourcePackagePublishingHistory.archiveID != Build.archiveID,
+            (SourcePackagePublishingHistory.archiveID !=
+                BinaryPackageBuild.archiveID),
             BinaryPackagePublishingHistory.archive ==
                 SourcePackagePublishingHistory.archiveID,
             BinaryPackagePublishingHistory.binarypackagerelease ==
                 BinaryPackageRelease.id,
-            BinaryPackageRelease.build == Build.id,
+            BinaryPackageRelease.build == BinaryPackageBuild.id,
             *extra_exprs)
 
         builds_union = builds_copied_into_archive.union(
@@ -1228,7 +1231,10 @@
         # can't sort on SourcePackagePublishingHistory.id after the
         # union. See bug 443353 for details.
         find_spec = (
-            SourcePackagePublishingHistory, Build, DistroArchSeries)
+            SourcePackagePublishingHistory,
+            BinaryPackageBuild,
+            DistroArchSeries,
+            )
 
         # Storm doesn't let us do builds_union.values('id') -
         # ('Union' object has no attribute 'columns'). So instead
@@ -1237,7 +1243,7 @@
 
         result_set = store.find(
             find_spec, builds_for_distroseries_expr,
-            Build.id.is_in(build_ids))
+            BinaryPackageBuild.id.is_in(build_ids))
 
         return result_set.order_by(
             SourcePackagePublishingHistory.id,
@@ -1285,14 +1291,14 @@
         # to avoid circular imports, since Build uses
         # SourcePackagePublishingHistory, BinaryPackageRelease uses Build
         # and DistroArchSeries uses BinaryPackagePublishingHistory.
-        from lp.soyuz.model.build import Build
+        from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
         from lp.soyuz.model.distroarchseries import (
             DistroArchSeries)
 
         join = [
             SourcePackagePublishingHistory.sourcepackagereleaseID ==
-                Build.sourcepackagereleaseID,
-            BinaryPackageRelease.build == Build.id,
+                BinaryPackageBuild.sourcepackagereleaseID,
+            BinaryPackageRelease.build == BinaryPackageBuild.id,
             BinaryPackageRelease.binarypackagenameID ==
                 BinaryPackageName.id,
             SourcePackagePublishingHistory.distroseriesID ==
@@ -1326,7 +1332,7 @@
         # to avoid circular imports, since Build uses
         # SourcePackagePublishingHistory and DistroArchSeries uses
         # BinaryPackagePublishingHistory.
-        from lp.soyuz.model.build import Build
+        from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
         from lp.soyuz.model.distroarchseries import (
             DistroArchSeries)
 
@@ -1338,12 +1344,15 @@
             one_or_more_source_publications)
 
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        published_builds = store.find(
-            (SourcePackagePublishingHistory, Build, DistroArchSeries),
+        published_builds = store.find((
+            SourcePackagePublishingHistory,
+            BinaryPackageBuild,
+            DistroArchSeries
+            ),
             self._getSourceBinaryJoinForSources(
                 source_publication_ids, active_binaries_only=False),
             BinaryPackagePublishingHistory.datepublished != None,
-            Build.buildstate.is_in(build_states))
+            BinaryPackageBuild.buildstate.is_in(build_states))
 
         published_builds.order_by(
             SourcePackagePublishingHistory.id,
@@ -1361,7 +1370,7 @@
         """See `IPublishingSet`."""
         # Import Build locally to avoid circular imports, since that
         # Build already imports SourcePackagePublishingHistory.
-        from lp.soyuz.model.build import Build
+        from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 
         source_publication_ids = self._extractIDs(
             one_or_more_source_publications)
@@ -1374,9 +1383,9 @@
             LibraryFileAlias.id == BinaryPackageFile.libraryfileID,
             BinaryPackageFile.binarypackagerelease ==
                 BinaryPackageRelease.id,
-            BinaryPackageRelease.buildID == Build.id,
+            BinaryPackageRelease.buildID == BinaryPackageBuild.id,
             SourcePackagePublishingHistory.sourcepackagereleaseID ==
-                Build.sourcepackagereleaseID,
+                BinaryPackageBuild.sourcepackagereleaseID,
             BinaryPackagePublishingHistory.binarypackagereleaseID ==
                 BinaryPackageRelease.id,
             BinaryPackagePublishingHistory.archiveID ==
@@ -1542,8 +1551,8 @@
         used in the calculation.
         """
         builds = source_publication.getBuilds()
-        summary = getUtility(IBuildSet).getStatusSummaryForBuilds(
-            builds)
+        summary = getUtility(
+            IBinaryPackageBuildSet).getStatusSummaryForBuilds(builds)
 
         # We only augment the result if:
         #   1. we (the SPPH) are ourselves in an active publishing state, and
 
=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2010-03-25 03:44:59 +0000
+++ lib/lp/soyuz/model/queue.py	2010-04-13 06:59:32 +0000
@@ -1370,7 +1370,7 @@
         foreignKey='PackageUpload'
         )
 
-    build = ForeignKey(dbName='build', foreignKey='Build')
+    build = ForeignKey(dbName='build', foreignKey='BinaryPackageBuild')
 
     def checkComponentAndSection(self):
         """See `IPackageUploadBuild`."""
 
=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2010-03-20 23:16:42 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2010-04-13 06:59:32 +0000
@@ -45,7 +45,7 @@
     PackageDiffAlreadyRequested, PackageDiffStatus)
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.files import SourcePackageReleaseFile
 from lp.soyuz.model.packagediff import PackageDiff
 from lp.soyuz.model.publishing import SourcePackagePublishingHistory
@@ -144,7 +144,7 @@
         # when copy-package works for copying packages across archives,
         # a build may well have a different archive to the corresponding
         # sourcepackagerelease.
-        return Build.select("""
+        return BinaryPackageBuild.select("""
             sourcepackagerelease = %s AND
             archive.id = build.archive AND
             archive.purpose IN %s
@@ -327,7 +327,7 @@
         # same datecreated.
         datecreated = datetime.datetime.now(pytz.timezone('UTC'))
 
-        return Build(distroarchseries=distroarchseries,
+        return BinaryPackageBuild(distroarchseries=distroarchseries,
                      sourcepackagerelease=self,
                      processor=processor,
                      buildstate=status,
@@ -356,7 +356,7 @@
         """ % sqlvalues(self, distroarchseries.architecturetag,
                         distroarchseries, archive)
 
-        select_results = Build.select(
+        select_results = BinaryPackageBuild.select(
             query, clauseTables=clauseTables, distinct=True,
             orderBy='-Build.id')
 
@@ -440,7 +440,7 @@
         # across all possible locations.
         query = " AND ".join(queries)
 
-        return Build.selectFirst(query, orderBy=['-datecreated'])
+        return BinaryPackageBuild.selectFirst(query, orderBy=['-datecreated'])
 
     def override(self, component=None, section=None, urgency=None):
         """See ISourcePackageRelease."""
 
=== modified file 'lib/lp/soyuz/scripts/buildd.py'
--- lib/lp/soyuz/scripts/buildd.py	2010-04-03 03:38:55 +0000
+++ lib/lp/soyuz/scripts/buildd.py	2010-04-13 06:59:32 +0000
@@ -23,7 +23,7 @@
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.scripts.base import (
     LaunchpadCronScript, LaunchpadScriptFailure)
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.pas import BuildDaemonPackagesArchSpecific
 
 # XXX cprov 2009-04-16: This function should live in
@@ -161,7 +161,7 @@
         """Create missing Buildd Jobs. """
         self.logger.info("Scanning for build queue entries that are missing")
 
-        buildset = getUtility(IBuildSet)
+        buildset = getUtility(IBinaryPackageBuildSet)
         builds = buildset.getPendingBuildsForArchSet(archseries)
 
         if not builds:
@@ -186,13 +186,15 @@
             return
 
         # Get the current build job candidates.
-        candidates = getUtility(IBuildSet).calculateCandidates(archseries)
+        candidates = getUtility(IBinaryPackageBuildSet).calculateCandidates(
+            archseries)
 
         self.logger.info("Found %d build in NEEDSBUILD state. Rescoring"
                          % candidates.count())
 
         for job in candidates:
-            uptodate_build = getUtility(IBuildSet).getByQueueEntry(job)
+            uptodate_build = getUtility(
+                IBinaryPackageBuildSet).getByQueueEntry(job)
             if uptodate_build.buildstate != BuildStatus.NEEDSBUILD:
                 continue
             job.score()
@@ -250,7 +252,7 @@
                 "Could not find distribution: %s" % self.options.distribution)
 
         # Iterate over all supported distroarchseries with available chroot.
-        build_set = getUtility(IBuildSet)
+        build_set = getUtility(IBinaryPackageBuildSet)
         for distroseries in distribution:
             if distroseries.status == SeriesStatus.OBSOLETE:
                 self.logger.debug(
 
=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py	2010-04-13 06:59:32 +0000
@@ -848,7 +848,7 @@
     def ensureBuild(self, binary, srcpkg, distroarchinfo, archtag):
         """Ensure a build record."""
         # Avoid circular imports.
-        from lp.soyuz.model.build import Build
+        from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 
         distroarchseries = distroarchinfo['distroarchseries']
         distribution = distroarchseries.distroseries.distribution
@@ -873,7 +873,7 @@
                       % quote(archtag))
 
         try:
-            build = Build.selectOne(query, clauseTables)
+            build = BinaryPackageBuild.selectOne(query, clauseTables)
         except SQLObjectMoreThanOneResultError:
             # XXX kiko 2005-10-27: Untested.
             raise MultipleBuildError("More than one build was found "
@@ -896,7 +896,7 @@
             key = None
 
             processor = distroarchinfo['processor']
-            build = Build(processor=processor.id,
+            build = BinaryPackageBuild(processor=processor.id,
                           distroarchseries=distroarchseries.id,
                           buildstate=BuildStatus.FULLYBUILT,
                           sourcepackagerelease=srcpkg.id,
 
=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2010-03-22 10:36:42 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2010-04-13 06:59:32 +0000
@@ -28,7 +28,7 @@
 from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.soyuz.adapters.packagelocation import build_package_location
 from lp.soyuz.interfaces.archive import ArchivePurpose, CannotCopy
-from lp.soyuz.interfaces.build import BuildSetStatus
+from lp.soyuz.interfaces.binarypackagebuild import BuildSetStatus
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, IPublishingSet,
     ISourcePackagePublishingHistory, active_publishing_status)
 
=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-04-13 06:59:32 +0000
@@ -21,7 +21,7 @@
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.services.scripts.base import LaunchpadScriptFailure
 from lp.soyuz.interfaces.component import IComponentSet
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.scripts.buildd import QueueBuilder, RetryDepwait
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 
@@ -228,7 +228,7 @@
         self.number_of_pending_builds = self.getPendingBuilds().count()
 
     def getPendingBuilds(self):
-        return Build.selectBy(buildstate=BuildStatus.NEEDSBUILD)
+        return BinaryPackageBuild.selectBy(buildstate=BuildStatus.NEEDSBUILD)
 
     def getRetryDepwait(self, distribution=None):
         test_args = ['-n']
@@ -268,7 +268,7 @@
 
     def testWorkingRun(self):
         """Modify sampledata and expects a new pending build to be created."""
-        depwait_build = Build.get(12)
+        depwait_build = BinaryPackageBuild.get(12)
 
         # Moving the target source to universe, so it can reach the only
         # published binary we have in sampledata.
@@ -287,7 +287,7 @@
         self.layer.commit()
 
         # Reload the build record after the multiple commits.
-        depwait_build = Build.get(12)
+        depwait_build = BinaryPackageBuild.get(12)
         self.assertEqual(
             self.number_of_pending_builds + 1,
             self.getPendingBuilds().count())
 
=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-03-24 07:05:39 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-04-13 06:59:32 +0000
@@ -30,7 +30,7 @@
 from lp.soyuz.adapters.packagelocation import PackageLocationError
 from lp.soyuz.interfaces.archive import (
     ArchivePurpose, CannotCopy)
-from lp.soyuz.interfaces.build import BuildSetStatus
+from lp.soyuz.interfaces.binarypackagebuild import BuildSetStatus
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,
@@ -49,8 +49,7 @@
     CopyChecker, do_copy, _do_delayed_copy, _do_direct_copy, PackageCopier,
     re_upload_file, UnembargoSecurityPackage, update_files_privacy)
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
-from lp.testing import (
-    TestCase, TestCaseWithFactory)
+from lp.testing import TestCaseWithFactory
 
 
 class ReUploadFileTestCase(TestCaseWithFactory):
 
=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-04-13 06:59:32 +0000
@@ -23,7 +23,7 @@
 from lp.services.job.interfaces.job import JobStatus
 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
 from lp.soyuz.interfaces.archivearch import IArchiveArchSet
-from lp.soyuz.interfaces.build import IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.soyuz.interfaces.packagecopyrequest import (
     IPackageCopyRequestSet, PackageCopyStatus)
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
@@ -130,7 +130,7 @@
         self._verifyClonedSourcePackages(copy_archive, hoary)
 
         # Now check that we have build records for the sources cloned.
-        builds = list(getUtility(IBuildSet).getBuildsForArchive(
+        builds = list(getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
             copy_archive, status=BuildStatus.NEEDSBUILD))
 
         # Please note: there will be no build for the pmount package
@@ -331,7 +331,7 @@
         self._verifyClonedSourcePackages(copy_archive, hoary)
 
         # Now check that we have zero build records for the sources cloned.
-        builds = list(getUtility(IBuildSet).getBuildsForArchive(
+        builds = list(getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
             copy_archive, status=BuildStatus.NEEDSBUILD))
         build_spns = [
             get_spn(removeSecurityProxy(build)).name for build in builds]
@@ -629,7 +629,7 @@
         self._verifyClonedSourcePackages(copy_archive, hoary)
 
         # Now check that we have the build records expected.
-        builds = list(getUtility(IBuildSet).getBuildsForArchive(
+        builds = list(getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
             copy_archive, status=BuildStatus.NEEDSBUILD))
         build_spns = [
             get_spn(removeSecurityProxy(build)).name for build in builds]
@@ -669,7 +669,8 @@
         self._verifyClonedSourcePackages(archive, hoary)
 
         # Get the binary builds generated for the copy archive at hand.
-        builds = list(getUtility(IBuildSet).getBuildsForArchive(archive))
+        builds = list(getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
+            archive))
         # At least one binary build was generated for the target copy archive.
         self.assertTrue(len(builds) > 0)
         # Now check that the binary builds and their associated job records
 
=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-04-13 06:59:32 +0000
@@ -412,10 +412,12 @@
 
     >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> from lp.registry.interfaces.person import IPersonSet
-    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
     >>> login('[e-mail]')
     >>> cprov_ppa = getUtility(IPersonSet).getByName('cprov').archive
-    >>> builds = getUtility(IBuildSet).getBuildsForArchive(cprov_ppa)
+    >>> builds = getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
+    ...     cprov_ppa)
     >>> builds[0].buildstate = BuildStatus.BUILDING
     >>> logout()
 
 
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt	2009-08-28 07:34:44 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-binarypackagerelease-index.txt	2010-04-13 06:59:32 +0000
@@ -21,13 +21,14 @@
 XXX: noodles 2009-01-16 bug 317863: move this into the STP.
 
   >>> from lp.soyuz.model.queue import PackageUploadBuild
-  >>> from lp.soyuz.interfaces.build import IBuildSet
+  >>> from lp.soyuz.interfaces.binarypackagebuild import (
+  ...     IBinaryPackageBuildSet)
   >>> from lp.registry.interfaces.pocket import (
   ...     PackagePublishingPocket)
   >>> from zope.component import getUtility
 
   >>> login('[e-mail]')
-  >>> build = getUtility(IBuildSet).getByBuildID(2)
+  >>> build = getUtility(IBinaryPackageBuildSet).getByBuildID(2)
   >>> package_upload = build.distroseries.createQueueEntry(
   ...     PackagePublishingPocket.UPDATES, 'changes.txt', 'my changes',
   ...     build.archive)
 
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-03-27 03:11:00 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-04-13 06:59:32 +0000
@@ -23,8 +23,10 @@
     >>> bob_builder.builderok = True
 
     # Set a known duration for the current job.
-    >>> from lp.soyuz.interfaces.build import IBuildSet
-    >>> build2 = getUtility(IBuildSet).getByQueueEntry(bob_builder.currentjob)
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
+    >>> build2 = getUtility(IBinaryPackageBuildSet).getByQueueEntry(
+    ...     bob_builder.currentjob)
     >>> in_progress_build = removeSecurityProxy(build2)
     >>> one_minute = datetime.timedelta(seconds=60)
     >>> in_progress_build.buildqueue_record.estimated_duration = one_minute
 
=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt	2010-04-13 06:59:32 +0000
@@ -64,17 +64,18 @@
     >>> login('[e-mail]')
 
     >>> from zope.component import getUtility
-    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> from lp.soyuz.interfaces.binarypackagebuild import (
+    ...     IBinaryPackageBuildSet)
 
-    >>> build = getUtility(IBuildSet).getByBuildID(26)
+    >>> build = getUtility(IBinaryPackageBuildSet).getByBuildID(26)
     >>> build.upload_log = build.buildlog
 
     >>> logout()
 
-IBuild 'build_log_url' and 'upload_log_url' are webapp URLs, relative
-to the build itself. This way API users can access private files
-(stored in the restricted librarian) directly because they will be
-proxied by the webapp.
+IBinaryPackageBuild 'build_log_url' and 'upload_log_url' are webapp
+URLs, relative to the build itself. This way API users can access
+private files (stored in the restricted librarian) directly because they
+will be proxied by the webapp.
 
     >>> builds = webservice.named_get(
     ...     source_pub['self_link'], 'getBuilds').jsonBody()
 
=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-03-17 09:55:40 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-04-13 06:59:32 +0000
@@ -27,7 +27,7 @@
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
 from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.binarypackagerelease import (
     BinaryPackageReleaseDownloadCount)
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
@@ -413,7 +413,7 @@
             self.ubuntutest, ArchivePurpose.PRIMARY)
 
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        sample_data = store.find(Build)
+        sample_data = store.find(BinaryPackageBuild)
         for build in sample_data:
             build.buildstate = BuildStatus.FULLYBUILT
         store.flush()
 
=== modified file 'lib/lp/soyuz/tests/test_build.py'
--- lib/lp/soyuz/tests/test_build.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/tests/test_build.py	2010-04-13 06:59:32 +0000
@@ -16,7 +16,8 @@
 from lp.buildmaster.interfaces.buildbase import BuildStatus, IBuildBase
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.model.buildqueue import BuildQueue
-from lp.soyuz.interfaces.build import IBuild, IBuildSet
+from lp.soyuz.interfaces.binarypackagebuild import (
+    IBinaryPackageBuild, IBinaryPackageBuildSet)
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.buildpackagejob import BuildPackageJob
@@ -38,13 +39,13 @@
             sourcename="gedit", status=PackagePublishingStatus.PUBLISHED)
         build = gedit_src_hist.createMissingBuilds()[0]
 
-        # The IBuild.calculated_buildstart property asserts
+        # The IBinaryPackageBuild.calculated_buildstart property asserts
         # that both datebuilt and buildduration are set.
         build.datebuilt = datetime.now(pytz.UTC)
         build.buildduration = timedelta(0, 1)
 
         self.assertProvides(build, IBuildBase)
-        self.assertProvides(build, IBuild)
+        self.assertProvides(build, IBinaryPackageBuild)
 
 class TestBuildUpdateDependencies(TestCaseWithFactory):
 
@@ -53,7 +54,7 @@
     def _setupSimpleDepwaitContext(self):
         """Use `SoyuzTestPublisher` to setup a simple depwait context.
 
-        Return an `IBuild` in MANUALDEWAIT state and depending on a
+        Return an `IBinaryPackageBuild` in MANUALDEWAIT state and depending on a
         binary that exists and is reachable.
         """
         test_publisher = SoyuzTestPublisher()
@@ -107,14 +108,14 @@
             0)
 
     def testUpdateDependenciesWorks(self):
-        # Calling `IBuild.updateDependencies` makes the build
+        # Calling `IBinaryPackageBuild.updateDependencies` makes the build
         # record ready for dispatch.
         depwait_build = self._setupSimpleDepwaitContext()
         depwait_build.updateDependencies()
         self.assertEquals(depwait_build.dependencies, '')
 
     def testInvalidDependencies(self):
-        # Calling `IBuild.updateDependencies` on a build with
+        # Calling `IBinaryPackageBuild.updateDependencies` on a build with
         # invalid 'dependencies' raises an AssertionError.
         # Anything not following '<name> [([relation] <version>)][, ...]'
         depwait_build = self._setupSimpleDepwaitContext()
@@ -140,10 +141,10 @@
             AssertionError, depwait_build.updateDependencies)
 
     def testBug378828(self):
-        # `IBuild.updateDependencies` copes with the scenario where
-        # the corresponding source publication is not active (deleted)
-        # and the source original component is not a valid ubuntu
-        # component.
+        # `IBinaryPackageBuild.updateDependencies` copes with the
+        # scenario where the corresponding source publication is not
+        # active (deleted) and the source original component is not a
+        # valid ubuntu component.
         depwait_build = self._setupSimpleDepwaitContext()
 
         depwait_build.current_source_publication.requestDeletion(
@@ -194,7 +195,7 @@
 
         # Short-cuts for our tests.
         self.archive = self.publisher.distroseries.main_archive
-        self.build_set = getUtility(IBuildSet)
+        self.build_set = getUtility(IBinaryPackageBuildSet)
 
     def test_getBuildsForArchive_no_params(self):
         # All builds should be returned when called without filtering
@@ -218,7 +219,7 @@
         super(TestBuildSetGetBuildsForBuilder, self).setUp()
 
         # Short-cuts for our tests.
-        self.build_set = getUtility(IBuildSet)
+        self.build_set = getUtility(IBinaryPackageBuildSet)
 
         # Create a 386 builder
         owner = self.factory.makePerson()
 
=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py	2010-04-13 06:59:32 +0000
@@ -15,7 +15,7 @@
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
-from lp.soyuz.model.build import Build
+from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
 from lp.soyuz.model.processor import ProcessorFamilySet
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import TestCaseWithFactory
@@ -126,7 +126,7 @@
 
         # First mark all builds in the sample data as already built.
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
-        sample_data = store.find(Build)
+        sample_data = store.find(BinaryPackageBuild)
         for build in sample_data:
             build.buildstate = BuildStatus.FULLYBUILT
         store.flush()