← Back to branch summary

~intellectronica/launchpad/revert-production-devel-mess

« back to all changes in this revision

Viewing changes to lib/lp/buildmaster/model/builder.py

  • Committer: Tom Berger
  • Date: 2010-03-10 13:32:52 UTC
  • Revision ID: tom.berger@canonical.com-20100310133252-zkal5edx6aoayeqb
revert r9084

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/buildmaster/model/builder.py
20
20
import urllib2
21
21
import xmlrpclib
22
22
 
 
23
from zope.interface import implements
 
24
from zope.component import getUtility
 
25
 
23
26
from sqlobject import (
24
 
    BoolCol, ForeignKey, IntCol, SQLObjectNotFound, StringCol)
 
27
    StringCol, ForeignKey, BoolCol, IntCol, SQLObjectNotFound)
 
28
 
25
29
from storm.store import Store
26
 
from zope.component import getUtility
27
 
from zope.interface import implements
28
30
 
29
31
from canonical.cachedproperty import cachedproperty
30
32
from canonical.config import config
31
33
from canonical.buildd.slave import BuilderStatus
32
 
from canonical.launchpad.helpers import filenameToContentType
33
 
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
34
 
from canonical.launchpad.webapp import urlappend
35
 
from canonical.launchpad.webapp.interfaces import NotFoundError
36
 
from canonical.launchpad.webapp.interfaces import (
37
 
    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
38
 
from canonical.lazr.utils import safe_hasattr
39
 
from canonical.librarian.utils import copy_and_close
40
 
from lp.buildmaster.interfaces.builder import (
41
 
    BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
42
 
    CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
43
34
from lp.buildmaster.interfaces.buildfarmjobbehavior import (
44
35
    BuildBehaviorMismatch)
45
 
from lp.buildmaster.interfaces.buildqueue import IBuildQueueSet
46
36
from lp.buildmaster.master import BuilddMaster
47
37
from lp.buildmaster.model.buildfarmjobbehavior import IdleBuildBehavior
48
 
from lp.buildmaster.model.buildqueue import BuildQueue, specific_job_classes
49
38
from canonical.database.sqlbase import SQLBase, sqlvalues
 
39
 
 
40
# XXX Michael Nelson 2010-01-13 bug=491330,506617
 
41
# These dependencies on soyuz will be removed when getBuildRecords()
 
42
# is moved, as well as when the generalisation of findBuildCandidate()
 
43
# is completed.
 
44
from lp.soyuz.model.buildqueue import BuildQueue, specific_job_classes
50
45
from lp.registry.interfaces.person import validate_public_person
 
46
from canonical.launchpad.helpers import filenameToContentType
51
47
from lp.services.job.interfaces.job import JobStatus
52
 
# XXX Michael Nelson 2010-01-13 bug=491330
53
 
# These dependencies on soyuz will be removed when getBuildRecords()
54
 
# is moved.
55
 
from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
56
48
from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
57
49
from lp.soyuz.interfaces.distroarchseries import IDistroArchSeriesSet
 
50
from canonical.launchpad.interfaces.librarian import ILibraryFileAliasSet
 
51
from canonical.launchpad.webapp.interfaces import NotFoundError
 
52
from lp.soyuz.interfaces.build import BuildStatus, IBuildSet
 
53
from lp.buildmaster.interfaces.builder import (
 
54
    BuildDaemonError, BuildSlaveFailure, CannotBuild, CannotFetchFile,
 
55
    CannotResumeHost, IBuilder, IBuilderSet, ProtocolVersionMismatch)
 
56
from lp.soyuz.interfaces.buildqueue import IBuildQueueSet
58
57
from lp.soyuz.model.buildpackagejob import BuildPackageJob
 
58
from canonical.launchpad.webapp import urlappend
 
59
from canonical.launchpad.webapp.interfaces import (
 
60
    IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 
61
from canonical.lazr.utils import safe_hasattr
 
62
from canonical.librarian.utils import copy_and_close
59
63
 
60
64
 
61
65
class TimeoutHTTPConnection(httplib.HTTPConnection):