Merge lp:~wgrant/launchpad/buildstatus-to-buildmaster into lp:launchpad

[William Grant]

Move BuildStatus from lp.soyuz to lp.buildmaster, and drop unused lp.soyuz.interfaces.build.incomplete_build_status.

This branch does the following:

 - Moves lp.soyuz.interfaces.build.BuildStatus to lp.buildmaster.interfaces.buildbase, where we would have moved it during the spring if it wasn't such a huge diff.
 - Removes the IBuildBase['buildstatus'] circular import hack from _schema_circular_imports, since BuildStatus is now in the same file.
 - Removes lp.soyuz.interfaces.build.incomplete_building_status, since it's unused, and would otherwise itself need to be moved.
 - Fixes all of the BuildStatus imports to point at the new location. THERE ARE LOTS.

[Michael Nelson (michael.nelson)]

Thanks for the other cleanups along the way too (moving imports from canonical.launchpad to lp.registry etc., and various re-orderings.)

I'll send this off to ec2 land now.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt	2010-03-06 21:38:23 +0000
+++ lib/canonical/launchpad/doc/tales.txt	2010-03-09 20:58:30 +0000
@@ -197,7 +197,7 @@
 
 The 'building' build is 14x14:
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> build.buildstate = BuildStatus.BUILDING
     >>> print test_tales("build/image:icon", build=build)
     <img width="14" height="14"...src="/@@/processing" />

=== modified file 'lib/canonical/launchpad/interfaces/_schema_circular_imports.py'
--- lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-02-27 21:18:10 +0000
+++ lib/canonical/launchpad/interfaces/_schema_circular_imports.py	2010-03-09 20:58:30 +0000
@@ -31,13 +31,12 @@
 from lp.bugs.interfaces.bugtarget import IHasBugs, IBugTarget
 from lp.bugs.interfaces.bugtracker import IBugTracker
 from lp.bugs.interfaces.bugwatch import IBugWatch
-from lp.soyuz.interfaces.build import (
-    BuildStatus, IBuild)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.soyuz.interfaces.build import IBuild
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.blueprints.interfaces.specification import ISpecification
 from lp.blueprints.interfaces.specificationbranch import (
     ISpecificationBranch)
-from lp.buildmaster.interfaces.buildbase import IBuildBase
 from lp.code.interfaces.branch import IBranch
 from lp.code.interfaces.branchmergeproposal import IBranchMergeProposal
 from lp.code.interfaces.branchsubscription import IBranchSubscription
@@ -322,8 +321,6 @@
     IStructuralSubscriptionTarget, 'parent_subscription_target',
     IStructuralSubscriptionTarget)
 
-IBuildBase['buildstate'].vocabulary = BuildStatus
-
 patch_reference_property(
     ISourcePackageRelease, 'source_package_recipe_build', ISourcePackageRecipeBuild)
 

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2010-03-08 13:51:22 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2010-03-09 20:58:30 +0000
@@ -21,6 +21,7 @@
 from xml.sax.saxutils import unescape as xml_unescape
 from datetime import datetime, timedelta
 from lazr.enum import enumerated_type_registry
+from lazr.uri import URI
 
 from zope.interface import Interface, Attribute, implements
 from zope.component import getUtility, queryAdapter, getMultiAdapter
@@ -42,27 +43,26 @@
     IBug, IBugSet, IDistribution, IFAQSet,
     IProduct, IProjectGroup, IDistributionSourcePackage, ISprint,
     LicenseStatus, NotFoundError)
-from lp.blueprints.interfaces.specification import ISpecification
-from lp.code.interfaces.branch import IBranch
-from lp.soyuz.interfaces.archive import ArchivePurpose, IPPA
-from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
 from canonical.launchpad.interfaces.launchpad import (
     IHasIcon, IHasLogo, IHasMugshot, IPrivacy)
-from lp.registry.interfaces.person import IPerson, IPersonSet
+import canonical.launchpad.pagetitles
+from canonical.launchpad.webapp import canonical_url, urlappend
+from canonical.launchpad.webapp.authorization import check_permission
+from canonical.launchpad.webapp.badge import IHasBadges
 from canonical.launchpad.webapp.interfaces import (
     IApplicationMenu, IContextMenu, IFacetMenu, ILaunchBag, INavigationMenu,
     IPrimaryContext, NoCanonicalUrl)
-import canonical.launchpad.pagetitles
-from canonical.launchpad.webapp import canonical_url, urlappend
-from lazr.uri import URI
 from canonical.launchpad.webapp.menu import get_current_view, get_facet
 from canonical.launchpad.webapp.publisher import (
     get_current_browser_request, LaunchpadView, nearest)
-from canonical.launchpad.webapp.authorization import check_permission
-from canonical.launchpad.webapp.badge import IHasBadges
 from canonical.launchpad.webapp.session import get_cookie_domain
 from canonical.lazr.canonicalurl import nearest_adapter
-from lp.soyuz.interfaces.build import BuildStatus
+from lp.blueprints.interfaces.specification import ISpecification
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.code.interfaces.branch import IBranch
+from lp.soyuz.interfaces.archive import ArchivePurpose, IPPA
+from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
+from lp.registry.interfaces.person import IPerson, IPersonSet
 
 
 SEPARATOR = ' : '

=== modified file 'lib/lp/archiveuploader/dscfile.py'
--- lib/lp/archiveuploader/dscfile.py	2010-02-16 02:30:15 +0000
+++ lib/lp/archiveuploader/dscfile.py	2010-03-09 20:58:30 +0000
@@ -25,6 +25,11 @@
 
 from zope.component import getUtility
 
+from canonical.encoding import guess as guess_encoding
+from canonical.launchpad.interfaces import (
+    GPGVerificationError, IGPGHandler, IGPGKeySet,
+    ISourcePackageNameSet, NotFoundError)
+from canonical.librarian.utils import copy_and_close
 from lp.archiveuploader.nascentuploadfile import (
     UploadWarning, UploadError, NascentUploadFile, SourceUploadFile)
 from lp.archiveuploader.tagfiles import (
@@ -33,18 +38,13 @@
     determine_source_file_type, get_source_file_extension,
     ParseMaintError, prefix_multi_line_string, re_is_component_orig_tar_ext,
     re_issource, re_valid_pkg_name, re_valid_version, safe_fix_maintainer)
-from canonical.encoding import guess as guess_encoding
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildSource)
 from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
 from lp.registry.interfaces.sourcepackage import SourcePackageFileType
 from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
-from canonical.launchpad.interfaces import (
-    GPGVerificationError, IGPGHandler, IGPGKeySet,
-    ISourcePackageNameSet, NotFoundError)
-from canonical.librarian.utils import copy_and_close
 
 
 class SignableTagFile:

=== modified file 'lib/lp/archiveuploader/nascentuploadfile.py'
--- lib/lp/archiveuploader/nascentuploadfile.py	2010-02-09 00:17:40 +0000
+++ lib/lp/archiveuploader/nascentuploadfile.py	2010-03-09 20:58:30 +0000
@@ -34,12 +34,12 @@
     re_no_epoch, re_no_revision, re_valid_version, re_valid_pkg_name,
     re_extract_src_version, determine_source_file_type)
 from canonical.encoding import guess as guess_encoding
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.soyuz.interfaces.binarypackagename import (
     IBinaryPackageNameSet)
 from lp.soyuz.interfaces.binarypackagerelease import (
     BinaryPackageFormat)
-from lp.soyuz.interfaces.build import (
-    BuildStatus, IBuildSet)
+from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.component import IComponentSet
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from lp.soyuz.interfaces.queue import (

=== modified file 'lib/lp/archiveuploader/tests/test_recipeuploads.py'
--- lib/lp/archiveuploader/tests/test_recipeuploads.py	2010-02-22 11:16:49 +0000
+++ lib/lp/archiveuploader/tests/test_recipeuploads.py	2010-03-09 20:58:30 +0000
@@ -14,9 +14,9 @@
 from lp.archiveuploader.tests.test_uploadprocessor import (
     TestUploadProcessorBase)
 from lp.archiveuploader.uploadprocessor import UploadProcessor
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildSource)
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.queue import PackageUploadStatus
 
 

=== modified file 'lib/lp/buildmaster/interfaces/buildbase.py'
--- lib/lp/buildmaster/interfaces/buildbase.py	2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/interfaces/buildbase.py	2010-03-09 20:58:30 +0000
@@ -7,11 +7,15 @@
 
 __metaclass__ = type
 
-__all__ = ['BUILDD_MANAGER_LOG_NAME', 'IBuildBase']
+__all__ = [
+    'BUILDD_MANAGER_LOG_NAME',
+    'BuildStatus',
+    'IBuildBase',
+    ]
 
 from zope.interface import Attribute, Interface
 from zope.schema import Choice, Datetime, Object, TextLine, Timedelta
-from lazr.enum import DBEnumeratedType
+from lazr.enum import DBEnumeratedType, DBItem
 from lazr.restful.declarations import exported
 from lazr.restful.fields import Reference
 
@@ -27,6 +31,86 @@
 BUILDD_MANAGER_LOG_NAME = "slave-scanner"
 
 
+class BuildStatus(DBEnumeratedType):
+    """Build status type
+
+    Builds exist in the database in a number of states such as 'complete',
+    'needs build' and 'dependency wait'. We need to track these states in
+    order to correctly manage the autobuilder queues in the BuildQueue table.
+    """
+
+    NEEDSBUILD = DBItem(0, """
+        Needs building
+
+        Build record is fresh and needs building. Nothing is yet known to
+        block this build and it is a candidate for building on any free
+        builder of the relevant architecture
+        """)
+
+    FULLYBUILT = DBItem(1, """
+        Successfully built
+
+        Build record is an historic account of the build. The build is complete
+        and needs no further work to complete it. The build log etc are all
+        in place if available.
+        """)
+
+    FAILEDTOBUILD = DBItem(2, """
+        Failed to build
+
+        Build record is an historic account of the build. The build failed and
+        cannot be automatically retried. Either a new upload will be needed
+        or the build will have to be manually reset into 'NEEDSBUILD' when
+        the issue is corrected
+        """)
+
+    MANUALDEPWAIT = DBItem(3, """
+        Dependency wait
+
+        Build record represents a package whose build dependencies cannot
+        currently be satisfied within the relevant DistroArchSeries. This
+        build will have to be manually given back (put into 'NEEDSBUILD') when
+        the dependency issue is resolved.
+        """)
+
+    CHROOTWAIT = DBItem(4, """
+        Chroot problem
+
+        Build record represents a build which needs a chroot currently known
+        to be damaged or bad in some way. The buildd maintainer will have to
+        reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
+        has been fixed.
+        """)
+
+    SUPERSEDED = DBItem(5, """
+        Build for superseded Source
+
+        Build record represents a build which never got to happen because the
+        source package release for the build was superseded before the job
+        was scheduled to be run on a builder. Builds which reach this state
+        will rarely if ever be reset to any other state.
+        """)
+
+    BUILDING = DBItem(6, """
+        Currently building
+
+        Build record represents a build which is being build by one of the
+        available builders.
+        """)
+
+    FAILEDTOUPLOAD = DBItem(7, """
+        Failed to upload
+
+        Build record is an historic account of a build that could not be
+        uploaded correctly. It's mainly genereated by failures in
+        process-upload which quietly rejects the binary upload resulted
+        by the build procedure.
+        In those cases all the build historic information will be stored (
+        buildlog, datebuilt, duration, builder, etc) and the buildd admins
+        will be notified via process-upload about the reason of the rejection.
+        """)
+
+
 class IBuildBase(Interface):
     """Common interface shared by farm jobs that build a package."""
 
@@ -37,10 +121,9 @@
             title=_('Date created'), required=True, readonly=True,
             description=_("The time when the build request was created.")))
 
-    # Really BuildStatus. Patched in _schema_circular_imports.
     buildstate = exported(
         Choice(
-            title=_('State'), required=True, vocabulary=DBEnumeratedType,
+            title=_('State'), required=True, vocabulary=BuildStatus,
             description=_("The current build state.")))
 
     date_first_dispatched = exported(

=== modified file 'lib/lp/buildmaster/master.py'
--- lib/lp/buildmaster/master.py	2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/master.py	2010-03-09 20:58:30 +0000
@@ -22,11 +22,12 @@
 from canonical.config import config
 from canonical.librarian.interfaces import ILibrarianClient
 from lp.archivepublisher.utils import process_in_batches
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.pas import BuildDaemonPackagesArchSpecific
 from lp.buildmaster.buildergroup import BuilderGroup
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
+from lp.soyuz.interfaces.build import IBuildSet
 
 
 def determineArchitecturesToBuild(pubrec, legal_archseries,

=== modified file 'lib/lp/buildmaster/model/buildbase.py'
--- lib/lp/buildmaster/model/buildbase.py	2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/model/buildbase.py	2010-03-09 20:58:30 +0000
@@ -29,10 +29,10 @@
 from canonical.launchpad.helpers import filenameToContentType
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.librarian.utils import copy_and_close
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.buildmaster.interfaces.buildbase import BUILDD_MANAGER_LOG_NAME
 from lp.registry.interfaces.pocket import pocketsuffix
-from lp.soyuz.interfaces.build import BuildStatus
 
 
 UPLOAD_LOG_FILENAME = 'uploader.log'

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/model/builder.py	2010-03-09 20:58:30 +0000
@@ -37,6 +37,7 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.lazr.utils import safe_hasattr
 from canonical.librarian.utils import copy_and_close
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import (
     BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
     CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
@@ -52,7 +53,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 BuildStatus, IBuildSet
+from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet
 from lp.soyuz.model.buildpackagejob import BuildPackageJob

=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/buildmaster/model/buildqueue.py	2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/model/buildqueue.py	2010-03-09 20:58:30 +0000
@@ -15,18 +15,18 @@
 from datetime import datetime, timedelta
 import logging
 
-from zope.component import getSiteManager, getUtility
-
-from zope.interface import implements
-
 from sqlobject import (
     StringCol, ForeignKey, BoolCol, IntCol, IntervalCol, SQLObjectNotFound)
 from storm.expr import In, Join, LeftJoin
 from storm.store import Store
+from zope.component import getSiteManager, getUtility
+from zope.interface import implements
 
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import SQLBase, sqlvalues
-from canonical.launchpad.webapp.interfaces import NotFoundError
+from canonical.launchpad.webapp.interfaces import (
+    DEFAULT_FLAVOR, IStoreSelector, MAIN_STORE, NotFoundError)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import (
     BuildFarmJobType, IBuildFarmJob)
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
@@ -34,10 +34,7 @@
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue, IBuildQueueSet
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.model.buildpackagejob import BuildPackageJob
-from canonical.launchpad.webapp.interfaces import (
-    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
 
 def normalize_virtualization(virtualized):

=== modified file 'lib/lp/buildmaster/model/packagebuildfarmjob.py'
--- lib/lp/buildmaster/model/packagebuildfarmjob.py	2010-03-09 14:11:00 +0000
+++ lib/lp/buildmaster/model/packagebuildfarmjob.py	2010-03-09 20:58:30 +0000
@@ -7,8 +7,8 @@
 
 from canonical.database.constants import UTC_NOW
 
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
-from lp.soyuz.interfaces.build import BuildStatus
 
 
 class PackageBuildFarmJob(BuildFarmJob):

=== modified file 'lib/lp/buildmaster/tests/queuebuilder.txt'
--- lib/lp/buildmaster/tests/queuebuilder.txt	2010-01-10 04:58:44 +0000
+++ lib/lp/buildmaster/tests/queuebuilder.txt	2010-03-09 20:58:30 +0000
@@ -229,7 +229,8 @@
     >>> copied_pub = pub_failed.copyTo(
     ...     hoary, PackagePublishingPocket.RELEASE, warty.main_archive)
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.soyuz.interfaces.build import IBuildSet
     >>> failed_build = pub_failed.sourcepackagerelease.createBuild(
     ...     warty['i386'], PackagePublishingPocket.RELEASE,
     ...     warty.main_archive, status=BuildStatus.FAILEDTOBUILD)

=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py	2010-03-06 00:32:52 +0000
+++ lib/lp/buildmaster/tests/test_builder.py	2010-03-09 20:58:30 +0000
@@ -11,13 +11,14 @@
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.testing import LaunchpadZopelessLayer
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior)
 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 BuildStatus, IBuildSet
+from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.binarypackagebuildbehavior import (
     BinaryPackageBuildBehavior)

=== modified file 'lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py'
--- lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py	2010-02-11 19:11:11 +0000
+++ lib/lp/buildmaster/tests/test_buildfarmjobbehavior.py	2010-03-09 20:58:30 +0000
@@ -5,8 +5,8 @@
 
 from unittest import TestCase, TestLoader
 
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.model.buildfarmjobbehavior import BuildFarmJobBehaviorBase
-from lp.soyuz.interfaces.build import BuildStatus
 
 
 class FakeBuildFarmJob:

=== modified file 'lib/lp/buildmaster/tests/test_buildqueue.py'
--- lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-08 12:35:15 +0000
+++ lib/lp/buildmaster/tests/test_buildqueue.py	2010-03-09 20:58:30 +0000
@@ -14,6 +14,7 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.testing import LaunchpadZopelessLayer
 
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
@@ -22,7 +23,6 @@
 from lp.buildmaster.model.buildqueue import BuildQueue, get_builder_data
 from lp.services.job.model.job import Job
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.model.processor import ProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.build import Build

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-03-06 00:32:52 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-03-09 20:58:30 +0000
@@ -22,6 +22,7 @@
 from canonical.launchpad.scripts.logger import BufferLogger
 from canonical.testing.layers import (
     LaunchpadScriptLayer, LaunchpadZopelessLayer, TwistedLayer)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.buildmaster.manager import (
@@ -29,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 BuildStatus, IBuildSet
+from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.tests.soyuzbuilddhelpers import SaneBuildingSlave
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2010-03-05 13:52:32 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2010-03-09 20:58:30 +0000
@@ -21,7 +21,7 @@
 from zope.component import getUtility
 from zope.interface import classProvides, implements
 
-from lp.buildmaster.interfaces.buildbase import IBuildBase
+from lp.buildmaster.interfaces.buildbase import BuildStatus, IBuildBase
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.model.buildbase import BuildBase
 from lp.buildmaster.model.buildqueue import BuildQueue
@@ -33,7 +33,6 @@
 from lp.services.job.model.job import Job
 from lp.soyuz.adapters.archivedependencies import (
     default_component_dependency_name,)
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
 

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-03-08 18:01:33 +0000
+++ lib/lp/registry/browser/person.py	2010-03-09 20:58:30 +0000
@@ -175,8 +175,8 @@
 from lp.code.interfaces.branchnamespace import (
     IBranchNamespaceSet, InvalidNamespace)
 from lp.bugs.interfaces.bugtask import IBugTaskSet
-from lp.soyuz.interfaces.build import (
-    BuildStatus, IBuildSet)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.soyuz.interfaces.build import IBuildSet
 from canonical.launchpad.interfaces.launchpad import (
     ILaunchpadCelebrities, INotificationRecipientSet, UnknownRecipientError)
 from canonical.launchpad.interfaces.message import (

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2010-03-08 01:51:58 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-03-09 20:58:30 +0000
@@ -21,6 +21,7 @@
 from canonical.database.constants import UTC_NOW
 from canonical.database.sqlbase import flush_database_updates, sqlvalues
 from canonical.lazr.utils import smartquote
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.code.model.branch import Branch
 from lp.code.model.hasbranches import HasBranchesMixin, HasMergeProposalsMixin
 from lp.bugs.model.bug import get_bug_tags_open_count
@@ -48,7 +49,6 @@
 from lp.translations.model.translationimportqueue import (
     HasTranslationImportsMixin)
 from canonical.launchpad.helpers import shortlist
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.registry.interfaces.packaging import PackagingType
 from lp.translations.interfaces.potemplate import IHasTranslationTemplates

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2010-03-08 05:03:15 +0000
+++ lib/lp/soyuz/browser/archive.py	2010-03-09 20:58:30 +0000
@@ -46,6 +46,7 @@
 from canonical.launchpad import _
 from canonical.launchpad.helpers import english_list
 from canonical.lazr.utils import smartquote
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.services.browser_helpers import get_user_agent_distroseries
 from lp.soyuz.browser.build import BuildRecordsView
 from lp.soyuz.browser.sourceslist import (
@@ -60,10 +61,8 @@
     IArchiveSet, IPPAActivateForm, NoSuchPPA)
 from lp.soyuz.interfaces.archivepermission import (
     ArchivePermissionType, IArchivePermissionSet)
-from lp.soyuz.interfaces.archivesubscriber import (
-    IArchiveSubscriberSet)
-from lp.soyuz.interfaces.build import (
-    BuildStatus, BuildSetStatus, IBuildSet)
+from lp.soyuz.interfaces.archivesubscriber import IArchiveSubscriberSet
+from lp.soyuz.interfaces.build import BuildSetStatus, IBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.registry.interfaces.series import SeriesStatus

=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2010-03-09 01:55:59 +0000
+++ lib/lp/soyuz/browser/build.py	2010-03-09 20:58:30 +0000
@@ -30,10 +30,10 @@
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from canonical.lazr.utils import safe_hasattr
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
 from lp.services.job.interfaces.job import JobStatus
-from lp.soyuz.interfaces.build import (
-    BuildStatus, IBuild, IBuildRescoreForm)
+from lp.soyuz.interfaces.build import IBuild, IBuildRescoreForm
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from canonical.launchpad.interfaces.launchpad import UnexpectedFormData
 from lp.soyuz.interfaces.queue import PackageUploadStatus

=== modified file 'lib/lp/soyuz/browser/tests/archive-views.txt'
--- lib/lp/soyuz/browser/tests/archive-views.txt	2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/browser/tests/archive-views.txt	2010-03-09 20:58:30 +0000
@@ -355,7 +355,8 @@
 
 Let's set some builds appropriately to see the results.
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.soyuz.interfaces.build import IBuildSet
     >>> warty_hppa = getUtility(IDistributionSet)['ubuntu']['warty']['hppa']
     >>> source = view.filtered_sources[0]
     >>> ignore = source.sourcepackagerelease.createBuild(

=== modified file 'lib/lp/soyuz/browser/tests/build-views.txt'
--- lib/lp/soyuz/browser/tests/build-views.txt	2010-02-24 13:39:16 +0000
+++ lib/lp/soyuz/browser/tests/build-views.txt	2010-03-09 20:58:30 +0000
@@ -4,7 +4,7 @@
 from the sampledata which happens to be in FAILEDTOBUILD status.
 
     >>> from zope.component import getUtility
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> from lp.registry.interfaces.distribution import IDistributionSet
 
     >>> ubuntu = getUtility(IDistributionSet).getByName('ubuntu')

=== modified file 'lib/lp/soyuz/browser/tests/builder-views.txt'
--- lib/lp/soyuz/browser/tests/builder-views.txt	2010-03-09 01:55:59 +0000
+++ lib/lp/soyuz/browser/tests/builder-views.txt	2010-03-09 20:58:30 +0000
@@ -140,11 +140,11 @@
 SoyuzTestPublisher is used to make a new publication only in Celso's
 private PPA.
 
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> from lp.soyuz.tests.test_publishing import (
     ...      SoyuzTestPublisher)
     >>> from lp.soyuz.interfaces.publishing import (
     ...     PackagePublishingStatus)
-    >>> from lp.soyuz.interfaces.build import BuildStatus
 
     >>> test_publisher = SoyuzTestPublisher()
     >>> test_publisher.prepareBreezyAutotest()

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-03-04 20:19:39 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-03-09 20:58:30 +0000
@@ -919,7 +919,7 @@
 be returned, but you can also ask for releases with builds in a certain
 state.
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> releases = cprov_archive.getSourcePackageReleases(
     ...     build_status=BuildStatus.FULLYBUILT)
     >>> for release in releases:
@@ -1037,7 +1037,6 @@
 
 Or return build records in a specific status:
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus
     >>> cprov_archive.getBuildRecords(
     ...     build_state=BuildStatus.FULLYBUILT).count()
     3

=== modified file 'lib/lp/soyuz/doc/build-estimated-dispatch-time.txt'
--- lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-02-10 10:11:46 +0000
+++ lib/lp/soyuz/doc/build-estimated-dispatch-time.txt	2010-03-09 20:58:30 +0000
@@ -44,7 +44,7 @@
 the pending job.
 
     >>> from datetime import timedelta
-    >>> from canonical.launchpad.interfaces import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> alsa_build = alsa_spr.createBuild(
     ...     hoary['i386'], PackagePublishingPocket.RELEASE,
     ...     hoary.main_archive)
@@ -64,7 +64,6 @@
 
 Make sure the job at hand is currently being built.
 
-    >>> from canonical.launchpad.interfaces import BuildStatus
     >>> cur_build.buildstate == BuildStatus.BUILDING
     True
 

=== modified file 'lib/lp/soyuz/doc/build-notification.txt'
--- lib/lp/soyuz/doc/build-notification.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/soyuz/doc/build-notification.txt	2010-03-09 20:58:30 +0000
@@ -15,7 +15,7 @@
 All build states are supported by the current implementation, however
 only failures should be reported this time.
 
-  >>> from canonical.launchpad.interfaces import IBuildSet
+  >>> from lp.soyuz.interfaces.build import IBuildSet
   >>> from lp.testing.mail_helpers import pop_notifications
   >>> buildset = getUtility(IBuildSet)
 
@@ -414,10 +414,10 @@
    they are in the team owning the PPA (to avoid spamming the innocent
    when PPA users upload unchanged source packages).
 
-  >>> from canonical.launchpad.interfaces import IPersonSet
+  >>> from lp.registry.interfaces.person import IPersonSet
   >>> cprov = getUtility(IPersonSet).getByName('cprov')
 
-  >>> from canonical.launchpad.interfaces import BuildStatus
+  >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
   >>> failed_candidate = cprov.archive.getBuildRecords(
   ...     build_state=BuildStatus.FAILEDTOBUILD, name='cdrkit')[0]
 
@@ -486,7 +486,7 @@
 
 We also make 'Foo Bar' the source signer.
 
-  >>> from canonical.launchpad.interfaces import IGPGKeySet
+  >>> from lp.registry.interfaces.gpg import IGPGKeySet
   >>> gpgkey = getUtility(IGPGKeySet).get(1)
   >>> print gpgkey.owner.name
   name16

=== modified file 'lib/lp/soyuz/doc/build.txt'
--- lib/lp/soyuz/doc/build.txt	2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/doc/build.txt	2010-03-09 20:58:30 +0000
@@ -136,7 +136,8 @@
 
 If the build does not have any uploads, None is returned:
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
+    >>> from lp.soyuz.interfaces.build import IBuildSet
     >>> at_build = getUtility(IBuildSet).getByBuildID(15)
     >>> print at_build.package_upload
     None

=== modified file 'lib/lp/soyuz/doc/buildd-dispatching.txt'
--- lib/lp/soyuz/doc/buildd-dispatching.txt	2010-03-05 13:52:32 +0000
+++ lib/lp/soyuz/doc/buildd-dispatching.txt	2010-03-09 20:58:30 +0000
@@ -187,7 +187,7 @@
 
     >>> BuilddSlaveTestSetup().tearDown()
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> build.buildstate = BuildStatus.FAILEDTOBUILD
     >>> job.destroySelf()
     >>> flush_database_updates()

=== modified file 'lib/lp/soyuz/doc/buildd-slavescanner.txt'
--- lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-03-09 14:11:00 +0000
+++ lib/lp/soyuz/doc/buildd-slavescanner.txt	2010-03-09 20:58:30 +0000
@@ -548,7 +548,7 @@
 Now in order to emulate a successfully binary upload we will update
 the build record to FULLYBUILT, as the process-upload would do:
 
-    >>> from canonical.launchpad.interfaces import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> build.buildstate = BuildStatus.FULLYBUILT
 
 Now the updateBuild should recognize this build record as a

=== modified file 'lib/lp/soyuz/doc/hasbuildrecords.txt'
--- lib/lp/soyuz/doc/hasbuildrecords.txt	2009-08-28 06:41:25 +0000
+++ lib/lp/soyuz/doc/hasbuildrecords.txt	2010-03-09 20:58:30 +0000
@@ -22,7 +22,7 @@
 The method has a number of filtering options, such as filtering by build
 status,
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> hoary.getBuildRecords(build_state=BuildStatus.FULLYBUILT).count()
     2
 

=== modified file 'lib/lp/soyuz/doc/packageupload-lookups.txt'
--- lib/lp/soyuz/doc/packageupload-lookups.txt	2009-07-01 13:16:44 +0000
+++ lib/lp/soyuz/doc/packageupload-lookups.txt	2010-03-09 20:58:30 +0000
@@ -29,7 +29,7 @@
 
     # Audit the source publication and builds of a given archive
     # and report missing uploads.
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> def check_upload_lookups(archive):
     ...     sources_missing_upload = []
     ...     sources = list(archive.getPublishedSources())

=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt	2010-02-09 12:32:01 +0000
+++ lib/lp/soyuz/doc/publishing.txt	2010-03-09 20:58:30 +0000
@@ -139,7 +139,7 @@
 augments the IBuildSet.getStatusSummaryForBuilds() method to include the
 'pending' state when builds are fully built but not yet published.
 
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> spph = test_publisher.getPubSource(
     ...     sourcename='abc', architecturehintlist='any')
     >>> builds = spph.createMissingBuilds()

=== modified file 'lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt'
--- lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt	2009-11-15 19:52:54 +0000
+++ lib/lp/soyuz/doc/sourcepackagerelease-build-lookup.txt	2010-03-09 20:58:30 +0000
@@ -43,7 +43,7 @@
     >>> hoary_evo_source = hoary.getSourcePackage('evolution')
     >>> evo_release = hoary_evo_source['1.0'].sourcepackagerelease
 
-    >>> from canonical.launchpad.interfaces import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> evo_build_i386 = evo_release.createBuild(
     ...     hoary_i386, pocket_release, ubuntu.main_archive,
     ...     status=BuildStatus.FULLYBUILT)

=== modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt'
--- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2010-01-31 19:36:27 +0000
+++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt	2010-03-09 20:58:30 +0000
@@ -620,10 +620,11 @@
 
 Check there's a SourcePackageRelease with no build.
 
+  >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
   >>> from lp.registry.model.sourcepackagename import SourcePackageName
-  >>> from canonical.launchpad.database import SourcePackageRelease, Build
   >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
-  >>> from canonical.launchpad.interfaces import BuildStatus
+  >>> from lp.soyuz.model.build import Build
+  >>> from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
   >>> spn = SourcePackageName.selectOneBy(name="baz")
   >>> spr = SourcePackageRelease.selectOneBy(sourcepackagenameID=spn.id)
   >>> spr_id = spr.id

=== modified file 'lib/lp/soyuz/interfaces/build.py'
--- lib/lp/soyuz/interfaces/build.py	2010-02-19 06:34:18 +0000
+++ lib/lp/soyuz/interfaces/build.py	2010-03-09 20:58:30 +0000
@@ -8,18 +8,16 @@
 __metaclass__ = type
 
 __all__ = [
-    'BuildStatus',
     'BuildSetStatus',
     'CannotBeRescored',
     'IBuild',
     'IBuildRescoreForm',
     'IBuildSet',
-    'incomplete_building_status',
     ]
 
 from zope.interface import Interface, Attribute
 from zope.schema import Bool, Int, Object, Text
-from lazr.enum import DBEnumeratedType, DBItem, EnumeratedType, Item
+from lazr.enum import EnumeratedType, Item
 
 from canonical.launchpad import _
 from lp.buildmaster.interfaces.buildbase import IBuildBase
@@ -40,92 +38,6 @@
     _message_prefix = "Cannot rescore build"
 
 
-class BuildStatus(DBEnumeratedType):
-    """Build status type
-
-    Builds exist in the database in a number of states such as 'complete',
-    'needs build' and 'dependency wait'. We need to track these states in
-    order to correctly manage the autobuilder queues in the BuildQueue table.
-    """
-
-    NEEDSBUILD = DBItem(0, """
-        Needs building
-
-        Build record is fresh and needs building. Nothing is yet known to
-        block this build and it is a candidate for building on any free
-        builder of the relevant architecture
-        """)
-
-    FULLYBUILT = DBItem(1, """
-        Successfully built
-
-        Build record is an historic account of the build. The build is complete
-        and needs no further work to complete it. The build log etc are all
-        in place if available.
-        """)
-
-    FAILEDTOBUILD = DBItem(2, """
-        Failed to build
-
-        Build record is an historic account of the build. The build failed and
-        cannot be automatically retried. Either a new upload will be needed
-        or the build will have to be manually reset into 'NEEDSBUILD' when
-        the issue is corrected
-        """)
-
-    MANUALDEPWAIT = DBItem(3, """
-        Dependency wait
-
-        Build record represents a package whose build dependencies cannot
-        currently be satisfied within the relevant DistroArchSeries. This
-        build will have to be manually given back (put into 'NEEDSBUILD') when
-        the dependency issue is resolved.
-        """)
-
-    CHROOTWAIT = DBItem(4, """
-        Chroot problem
-
-        Build record represents a build which needs a chroot currently known
-        to be damaged or bad in some way. The buildd maintainer will have to
-        reset all relevant CHROOTWAIT builds to NEEDSBUILD after the chroot
-        has been fixed.
-        """)
-
-    SUPERSEDED = DBItem(5, """
-        Build for superseded Source
-
-        Build record represents a build which never got to happen because the
-        source package release for the build was superseded before the job
-        was scheduled to be run on a builder. Builds which reach this state
-        will rarely if ever be reset to any other state.
-        """)
-
-    BUILDING = DBItem(6, """
-        Currently building
-
-        Build record represents a build which is being build by one of the
-        available builders.
-        """)
-
-    FAILEDTOUPLOAD = DBItem(7, """
-        Failed to upload
-
-        Build record is an historic account of a build that could not be
-        uploaded correctly. It's mainly genereated by failures in
-        process-upload which quietly rejects the binary upload resulted
-        by the build procedure.
-        In those cases all the build historic information will be stored (
-        buildlog, datebuilt, duration, builder, etc) and the buildd admins
-        will be notified via process-upload about the reason of the rejection.
-        """)
-
-
-incomplete_building_status = (
-    BuildStatus.NEEDSBUILD,
-    BuildStatus.BUILDING,
-    )
-
-
 class IBuildView(IBuildBase):
     """A Build interface for items requiring launchpad.View."""
     id = Int(title=_('ID'), required=True, readonly=True)

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-03-08 18:01:33 +0000
+++ lib/lp/soyuz/model/archive.py	2010-03-09 20:58:30 +0000
@@ -31,6 +31,7 @@
 from canonical.database.enumcol import EnumCol
 from canonical.database.sqlbase import (
     cursor, quote, quote_like, sqlvalues, SQLBase)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.services.job.interfaces.job import JobStatus
 from lp.soyuz.adapters.packagelocation import PackageLocation
 from canonical.launchpad.components.tokens import (
@@ -67,7 +68,7 @@
 from lp.soyuz.interfaces.archivesubscriber import (
     ArchiveSubscriberStatus, IArchiveSubscriberSet, ArchiveSubscriptionError)
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFileType
-from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
+from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.component import IComponent, IComponentSet
 from lp.registry.interfaces.distroseries import IDistroSeriesSet

=== modified file 'lib/lp/soyuz/model/build.py'
--- lib/lp/soyuz/model/build.py	2010-03-05 13:52:32 +0000
+++ lib/lp/soyuz/model/build.py	2010-03-09 20:58:30 +0000
@@ -41,6 +41,7 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.launchpad.webapp.tales import DurationFormatterAPI
 from lp.archivepublisher.utils import get_ppa_reference
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjob import BuildFarmJobType
 from lp.buildmaster.model.buildbase import BuildBase
 from lp.buildmaster.model.buildqueue import BuildQueue
@@ -49,7 +50,7 @@
 from lp.soyuz.adapters.archivedependencies import get_components_for_building
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.build import (
-    BuildStatus, BuildSetStatus, CannotBeRescored, IBuild, IBuildSet)
+    BuildSetStatus, CannotBeRescored, IBuild, IBuildSet)
 from lp.buildmaster.interfaces.buildbase import IBuildBase
 from lp.soyuz.interfaces.publishing import active_publishing_status
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease

=== modified file 'lib/lp/soyuz/model/buildpackagejob.py'
--- lib/lp/soyuz/model/buildpackagejob.py	2010-01-30 05:27:48 +0000
+++ lib/lp/soyuz/model/buildpackagejob.py	2010-03-09 20:58:30 +0000
@@ -17,11 +17,12 @@
 
 from canonical.database.sqlbase import sqlvalues
 
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.model.packagebuildfarmjob import PackageBuildFarmJob
 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 BuildStatus, IBuildSet
+from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.buildpackagejob import IBuildPackageJob
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-02-24 16:14:37 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-03-09 20:58:30 +0000
@@ -31,11 +31,18 @@
 from storm.expr import Desc, In, LeftJoin
 from storm.store import Store
 
-from lp.buildmaster.master import determineArchitecturesToBuild
 from canonical.database.sqlbase import SQLBase, sqlvalues
 from canonical.database.constants import UTC_NOW
 from canonical.database.datetimecol import UtcDateTimeCol
 from canonical.database.enumcol import EnumCol
+from canonical.launchpad.components.decoratedresultset import (
+    DecoratedResultSet)
+from canonical.launchpad.webapp.interfaces import (
+    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
+from canonical.launchpad.webapp.interfaces import NotFoundError
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.buildmaster.master import determineArchitecturesToBuild
+from lp.registry.interfaces.person import validate_public_person
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
@@ -46,22 +53,16 @@
 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.component import IComponentSet
-from lp.soyuz.interfaces.queue import PackageUploadStatus
 from lp.soyuz.interfaces.publishing import (
     active_publishing_status, IBinaryPackageFilePublishing,
     IBinaryPackagePublishingHistory, IPublishingSet,
     ISourcePackageFilePublishing, ISourcePackagePublishingHistory,
     PackagePublishingPriority, PackagePublishingStatus,
     PoolFileOverwriteError)
-from lp.soyuz.interfaces.build import BuildSetStatus, BuildStatus, IBuildSet
+from lp.soyuz.interfaces.queue import PackageUploadStatus
 from lp.soyuz.scripts.changeoverride import ArchiveOverriderError
-from canonical.launchpad.components.decoratedresultset import (
-    DecoratedResultSet)
-from canonical.launchpad.webapp.interfaces import (
-        IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
-from lp.registry.interfaces.person import validate_public_person
-from canonical.launchpad.webapp.interfaces import NotFoundError
 
 
 # XXX cprov 2006-08-18: move it away, perhaps archivepublisher/pool.py

=== modified file 'lib/lp/soyuz/model/sourcepackagerelease.py'
--- lib/lp/soyuz/model/sourcepackagerelease.py	2010-02-22 12:07:03 +0000
+++ lib/lp/soyuz/model/sourcepackagerelease.py	2010-03-09 20:58:30 +0000
@@ -34,12 +34,13 @@
     LibraryFileAlias, LibraryFileContent)
 from canonical.launchpad.helpers import shortlist
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
-from lp.translations.interfaces.translationimportqueue import (
-    ITranslationImportQueue)
 from canonical.launchpad.webapp.interfaces import NotFoundError
 from lp.archiveuploader.utils import determine_source_file_type
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.registry.interfaces.person import validate_public_person
+from lp.registry.interfaces.sourcepackage import (
+    SourcePackageType, SourcePackageUrgency)
 from lp.soyuz.interfaces.archive import IArchiveSet, MAIN_ARCHIVE_PURPOSES
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.packagediff import (
     PackageDiffAlreadyRequested, PackageDiffStatus)
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
@@ -51,9 +52,8 @@
 from lp.soyuz.model.queue import (
     PackageUpload, PackageUploadSource)
 from lp.soyuz.scripts.queue import QueueActionError
-from lp.registry.interfaces.person import validate_public_person
-from lp.registry.interfaces.sourcepackage import (
-    SourcePackageType, SourcePackageUrgency)
+from lp.translations.interfaces.translationimportqueue import (
+    ITranslationImportQueue)
 
 
 def _filter_ubuntu_translation_file(filename):

=== modified file 'lib/lp/soyuz/scripts/gina/handlers.py'
--- lib/lp/soyuz/scripts/gina/handlers.py	2010-01-10 04:58:44 +0000
+++ lib/lp/soyuz/scripts/gina/handlers.py	2010-03-09 20:58:30 +0000
@@ -24,34 +24,29 @@
 
 from zope.component import getUtility
 
-from canonical.database.sqlbase import quote
+from canonical.database.sqlbase import quote, sqlvalues
 from canonical.database.constants import UTC_NOW
+from canonical.launchpad.scripts import log
 
 from lp.archivepublisher.diskpool import poolify
 from lp.archiveuploader.tagfiles import parse_tagfile
 from lp.archiveuploader.utils import (determine_binary_file_type,
     determine_source_file_type)
-
-from canonical.database.sqlbase import sqlvalues
-
-from canonical.launchpad.scripts import log
-from lp.soyuz.scripts.gina.library import getLibraryAlias
-from lp.soyuz.scripts.gina.packages import (SourcePackageData,
-    urgencymap, prioritymap, get_dsc_path, PoolFileNotFound)
-
-from lp.registry.model.sourcepackagename import SourcePackageName
-from lp.soyuz.model.component import Component
-from lp.soyuz.model.processor import Processor
-from lp.soyuz.model.section import Section
-from lp.soyuz.model.files import (
-    BinaryPackageFile, SourcePackageReleaseFile)
-
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.registry.interfaces.person import IPersonSet, PersonCreationRationale
 from lp.registry.interfaces.sourcepackage import SourcePackageType
+from lp.registry.model.sourcepackagename import SourcePackageName
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+from lp.soyuz.model.component import Component
+from lp.soyuz.model.files import (
+    BinaryPackageFile, SourcePackageReleaseFile)
+from lp.soyuz.model.processor import Processor
+from lp.soyuz.model.section import Section
+from lp.soyuz.scripts.gina.library import getLibraryAlias
+from lp.soyuz.scripts.gina.packages import (SourcePackageData,
+    urgencymap, prioritymap, get_dsc_path, PoolFileNotFound)
 
 
 def check_not_in_librarian(files, archive_root, directory):

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2010-01-10 04:58:44 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2010-03-09 20:58:30 +0000
@@ -20,27 +20,22 @@
 import os
 import tempfile
 
+from lazr.delegates import delegates
 from zope.component import getUtility
 
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 from canonical.librarian.utils import copy_and_close
-from lazr.delegates import delegates
-from lp.soyuz.adapters.packagelocation import (
-    build_package_location)
-from lp.soyuz.interfaces.archive import (
-    ArchivePurpose, CannotCopy)
-from lp.soyuz.interfaces.build import (
-    BuildStatus, BuildSetStatus)
+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.publishing import (
     IBinaryPackagePublishingHistory, IPublishingSet,
     ISourcePackagePublishingHistory, active_publishing_status)
-from lp.soyuz.interfaces.queue import (
-    IPackageUpload, IPackageUploadSet)
+from lp.soyuz.interfaces.queue import IPackageUpload, IPackageUploadSet
 from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
-from lp.soyuz.scripts.ftpmasterbase import (
-    SoyuzScript, SoyuzScriptError)
-from lp.soyuz.scripts.processaccepted import (
-    close_bugs_for_sourcepublication)
+from lp.soyuz.scripts.ftpmasterbase import SoyuzScript, SoyuzScriptError
+from lp.soyuz.scripts.processaccepted import close_bugs_for_sourcepublication
 
 
 # XXX cprov 2009-06-12: This function could be incorporated in ILFA,

=== modified file 'lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py'
--- lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-02-09 12:32:01 +0000
+++ lib/lp/soyuz/scripts/tests/test_buildd_cronscripts.py	2010-03-09 20:58:30 +0000
@@ -14,17 +14,16 @@
 from zope.component import getUtility
 
 from canonical.config import config
-from lp.soyuz.model.build import Build
-from lp.soyuz.interfaces.build import BuildStatus
-from lp.soyuz.interfaces.component import IComponentSet
 from canonical.launchpad.scripts.logger import QuietFakeLogger
-from lp.soyuz.scripts.buildd import (
-    QueueBuilder, RetryDepwait)
-from lp.services.scripts.base import LaunchpadScriptFailure
-from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from canonical.testing import (
     DatabaseLayer, LaunchpadLayer, LaunchpadZopelessLayer)
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 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.scripts.buildd import QueueBuilder, RetryDepwait
+from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 
 
 class TestCronscriptBase(unittest.TestCase):

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-03-09 20:58:30 +0000
@@ -22,6 +22,7 @@
 from lp.bugs.interfaces.bug import (
     CreateBugParams, IBugSet)
 from lp.bugs.interfaces.bugtask import BugTaskStatus
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.person import IPersonSet
@@ -29,8 +30,7 @@
 from lp.soyuz.adapters.packagelocation import PackageLocationError
 from lp.soyuz.interfaces.archive import (
     ArchivePurpose, CannotCopy)
-from lp.soyuz.interfaces.build import (
-    BuildSetStatus, BuildStatus)
+from lp.soyuz.interfaces.build import BuildSetStatus
 from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, ISourcePackagePublishingHistory,

=== modified file 'lib/lp/soyuz/scripts/tests/test_populatearchive.py'
--- lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-02-19 13:40:43 +0000
+++ lib/lp/soyuz/scripts/tests/test_populatearchive.py	2010-03-09 20:58:30 +0000
@@ -17,15 +17,16 @@
 from canonical.launchpad.scripts import BufferLogger
 from canonical.testing import LaunchpadZopelessLayer
 from canonical.testing.layers import DatabaseLayer
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 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 BuildStatus, IBuildSet
-from lp.soyuz.interfaces.publishing import PackagePublishingStatus
+from lp.soyuz.interfaces.build import IBuildSet
 from lp.soyuz.interfaces.packagecopyrequest import (
     IPackageCopyRequestSet, PackageCopyStatus)
+from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.scripts.ftpmaster import PackageLocationError, SoyuzScriptError
 from lp.soyuz.scripts.populate_archive import ArchivePopulator
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher

=== modified file 'lib/lp/soyuz/stories/ppa/xx-copy-packages.txt'
--- lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-01-31 19:36:27 +0000
+++ lib/lp/soyuz/stories/ppa/xx-copy-packages.txt	2010-03-09 20:58:30 +0000
@@ -972,7 +972,7 @@
     ...     archive=jblack_friends.archive,
     ...     status=PackagePublishingStatus.PUBLISHED)
     >>> [build] = jblack_friends_foo_src.createMissingBuilds()
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> build.buildstate = BuildStatus.FAILEDTOBUILD
 
     >>> flush_database_updates()

=== modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt'
--- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-02-26 19:29:51 +0000
+++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt	2010-03-09 20:58:30 +0000
@@ -410,10 +410,11 @@
 If the ppa has some current activity (building or waiting builds) then this
 is also included in the statistics portlet.
 
-    >>> login('[e-mail]')
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> from lp.registry.interfaces.person import IPersonSet
+    >>> from lp.soyuz.interfaces.build import IBuildSet
+    >>> login('[e-mail]')
     >>> cprov_ppa = getUtility(IPersonSet).getByName('cprov').archive
-    >>> from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
     >>> builds = getUtility(IBuildSet).getBuildsForArchive(cprov_ppa)
     >>> builds[0].buildstate = BuildStatus.BUILDING
     >>> logout()

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-build-record.txt'
--- lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-02-24 14:23:31 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-build-record.txt	2010-03-09 20:58:30 +0000
@@ -146,7 +146,7 @@
     # build with an known buildlog 'tail'.
     >>> login('[e-mail]')
     >>> from canonical.database.constants import UTC_NOW
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> in_progress_build.buildqueue_record.reset()
     >>> build.buildqueue_record.markAsBuilding(bob_builder)
     >>> build.buildqueue_record.logtail = 'one line\nanother line'

=== modified file 'lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt'
--- lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2009-11-20 18:07:15 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-buildfarm-index.txt	2010-03-09 20:58:30 +0000
@@ -60,7 +60,7 @@
     >>> import datetime
     >>> from zope.component import getUtility
     >>> from zope.security.proxy import removeSecurityProxy
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> login('[e-mail]')
     >>> cprov = getUtility(IPersonSet).getByName('cprov')

=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt	2009-08-13 15:12:16 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt	2010-03-09 20:58:30 +0000
@@ -174,7 +174,7 @@
 alter the buildstate to one that cannot be retried:
 
     >>> login('[e-mail]')
-    >>> from lp.soyuz.interfaces.build import BuildStatus
+    >>> from lp.buildmaster.interfaces.buildbase import BuildStatus
     >>> build.buildstate = BuildStatus.FAILEDTOUPLOAD
     >>> logout()
 

=== modified file 'lib/lp/soyuz/tests/test_archive.py'
--- lib/lp/soyuz/tests/test_archive.py	2010-02-27 21:18:10 +0000
+++ lib/lp/soyuz/tests/test_archive.py	2010-03-09 20:58:30 +0000
@@ -15,6 +15,7 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.testing import LaunchpadZopelessLayer
 
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.services.job.interfaces.job import JobStatus
@@ -22,7 +23,6 @@
     IArchiveSet, ArchivePurpose, CannotSwitchPrivacy)
 from lp.soyuz.interfaces.archivearch import IArchiveArchSet
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.processor import IProcessorFamilySet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.build import Build

=== modified file 'lib/lp/soyuz/tests/test_build.py'
--- lib/lp/soyuz/tests/test_build.py	2010-03-06 00:32:52 +0000
+++ lib/lp/soyuz/tests/test_build.py	2010-03-09 20:58:30 +0000
@@ -13,16 +13,16 @@
 from canonical.database.constants import UTC_NOW
 from canonical.testing import LaunchpadZopelessLayer
 from lp.services.job.model.job import Job
-from lp.buildmaster.interfaces.buildbase import IBuildBase
+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.component import IComponentSet
-from lp.soyuz.interfaces.build import BuildStatus, IBuild, IBuildSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.buildpackagejob import BuildPackageJob
 from lp.soyuz.model.processor import ProcessorFamilySet
+from lp.soyuz.tests.soyuzbuilddhelpers import WaitingSlave
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
-from lp.soyuz.tests.soyuzbuilddhelpers import WaitingSlave
 from lp.testing import TestCaseWithFactory
 
 

=== modified file 'lib/lp/soyuz/tests/test_buildpackagejob.py'
--- lib/lp/soyuz/tests/test_buildpackagejob.py	2010-01-30 05:27:48 +0000
+++ lib/lp/soyuz/tests/test_buildpackagejob.py	2010-03-09 20:58:30 +0000
@@ -11,9 +11,9 @@
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.testing import LaunchpadZopelessLayer
 
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.builder import IBuilderSet
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.model.build import Build
 from lp.soyuz.model.processor import ProcessorFamilySet

=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2009-12-13 11:55:40 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2010-03-09 20:58:30 +0000
@@ -14,12 +14,12 @@
 from canonical.testing import LaunchpadZopelessLayer
 from email import message_from_string
 from lp.archiveuploader.tests import datadir
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.series import SeriesStatus
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.mail import stub
 from lp.soyuz.interfaces.archive import ArchivePurpose
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.queue import (
     IPackageUploadSet, PackageUploadCustomFormat, PackageUploadStatus)

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-02-27 20:20:03 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-03-09 20:58:30 +0000
@@ -14,34 +14,34 @@
 import pytz
 from zope.component import getUtility
 
-from lp.archivepublisher.config import Config
-from lp.archivepublisher.diskpool import DiskPool
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
-from lp.soyuz.model.publishing import (
-    SourcePackagePublishingHistory, BinaryPackagePublishingHistory)
-from lp.soyuz.model.processor import ProcessorFamily
-from lp.soyuz.interfaces.component import IComponentSet
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
-from lp.soyuz.interfaces.section import ISectionSet
 from canonical.launchpad.webapp.interfaces import NotFoundError
+from canonical.testing import LaunchpadZopelessLayer
+from lp.archivepublisher.config import Config
+from lp.archivepublisher.diskpool import DiskPool
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.registry.interfaces.distribution import IDistributionSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.sourcepackage import SourcePackageUrgency
 from lp.registry.interfaces.sourcepackagename import ISourcePackageNameSet
+from lp.soyuz.model.processor import ProcessorFamily
+from lp.soyuz.model.publishing import (
+    SourcePackagePublishingHistory, BinaryPackagePublishingHistory)
 from lp.soyuz.interfaces.archive import ArchivePurpose
 from lp.soyuz.interfaces.archivearch import IArchiveArchSet
 from lp.soyuz.interfaces.binarypackagename import IBinaryPackageNameSet
 from lp.soyuz.interfaces.binarypackagerelease import BinaryPackageFormat
-from lp.soyuz.interfaces.build import BuildStatus
-from lp.soyuz.interfaces.queue import PackageUploadStatus
+from lp.soyuz.interfaces.component import IComponentSet
+from lp.soyuz.interfaces.section import ISectionSet
 from lp.soyuz.interfaces.publishing import (
     PackagePublishingPriority, PackagePublishingStatus)
+from lp.soyuz.interfaces.queue import PackageUploadStatus
 from canonical.launchpad.scripts import FakeLogger
 from lp.testing import TestCaseWithFactory
 from lp.testing.factory import LaunchpadObjectFactory
-from canonical.testing import LaunchpadZopelessLayer
 
 
 class SoyuzTestPublisher:

=== modified file 'lib/lp/soyuz/tests/test_publishing_models.py'
--- lib/lp/soyuz/tests/test_publishing_models.py	2010-01-31 19:36:27 +0000
+++ lib/lp/soyuz/tests/test_publishing_models.py	2010-03-09 20:58:30 +0000
@@ -10,7 +10,7 @@
 from canonical.database.constants import UTC_NOW
 from canonical.testing import LaunchpadZopelessLayer
 
-from lp.soyuz.interfaces.build import BuildStatus
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.soyuz.interfaces.publishing import (IPublishingSet,
     PackagePublishingStatus)
 from lp.soyuz.tests.test_build import BaseTestCaseWithThreeBuilds

=== modified file 'lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py'
--- lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py	2010-03-06 00:32:52 +0000
+++ lib/lp/translations/tests/test_translationtemplatesbuildbehavior.py	2010-03-09 20:58:30 +0000
@@ -14,10 +14,10 @@
 
 from canonical.launchpad.interfaces import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
+from lp.buildmaster.interfaces.buildbase import BuildStatus
 from lp.buildmaster.interfaces.buildfarmjobbehavior import (
     IBuildFarmJobBehavior)
 from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
-from lp.soyuz.interfaces.build import BuildStatus
 from lp.testing import TestCaseWithFactory
 from lp.testing.fakemethod import FakeMethod
 

=== modified file 'scripts/ftpmaster-tools/buildd-mass-retry.py'
--- scripts/ftpmaster-tools/buildd-mass-retry.py	2009-10-13 14:38:07 +0000
+++ scripts/ftpmaster-tools/buildd-mass-retry.py	2010-03-09 20:58:30 +0000
@@ -20,12 +20,12 @@
 
 from canonical.database.sqlbase import ISOLATION_LEVEL_READ_COMMITTED
 from canonical.launchpad.interfaces import NotFoundError
-from lp.registry.interfaces.distribution import IDistributionSet
-from lp.soyuz.interfaces.build import BuildStatus
-from lp.registry.interfaces.pocket import PackagePublishingPocket
 from canonical.launchpad.scripts import (
     execute_zcml_for_scripts, logger_options, logger)
 from canonical.lp import initZopeless
+from lp.buildmaster.interfaces.buildbase import BuildStatus
+from lp.registry.interfaces.distribution import IDistributionSet
+from lp.registry.interfaces.pocket import PackagePublishingPocket
 
 
 def main():

=== modified file 'scripts/ftpmaster-tools/initialise-from-parent.py'
--- scripts/ftpmaster-tools/initialise-from-parent.py	2009-11-17 02:33:27 +0000
+++ scripts/ftpmaster-tools/initialise-from-parent.py	2010-03-09 20:58:30 +0000
@@ -25,11 +25,11 @@
 from canonical.config import config
 from canonical.database.sqlbase import (
     sqlvalues, flush_database_updates, cursor, flush_database_caches)
-from canonical.lp import initZopeless
-from lp.soyuz.interfaces.queue import PackageUploadStatus
 from canonical.launchpad.interfaces import IDistributionSet, NotFoundError
 from canonical.launchpad.scripts import (
     execute_zcml_for_scripts, logger, logger_options)
+from canonical.lp import initZopeless
+from lp.soyuz.interfaces.queue import PackageUploadStatus
 
 
 def main():
@@ -107,8 +107,8 @@
     via initialiseFromParent method.
     """
     # Avoid circular import.
+    from lp.buildmaster.interfaces.buildbase import BuildStatus
     from lp.registry.interfaces.pocket import PackagePublishingPocket
-    from lp.soyuz.interfaces.build import BuildStatus
 
     parentseries = distroseries.parent_series