← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

  • Committer: Raphael Badin
  • Date: 2012-01-04 20:16:18 UTC
  • mfrom: (14513.5.3 builder-history-lfa)
  • mto: This revision was merged to the branch mainline in revision 14654.
  • Revision ID: raphael.badin@canonical.com-20120104201618-meb7ak15wdgpq31e
Merged builder-history-lfa into builders-timeout-903827-2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/buildmaster/model/packagebuild.py
53
53
from lp.services.helpers import filenameToContentType
54
54
from lp.services.librarian.browser import ProxiedLibraryFileAlias
55
55
from lp.services.librarian.interfaces import ILibraryFileAliasSet
56
 
from lp.services.propertycache import get_property_cache
57
56
from lp.services.webapp.interfaces import (
58
57
    DEFAULT_FLAVOR,
59
58
    IStoreSelector,
300
299
                            % (status, self.buildqueue_record.builder.url))
301
300
            return
302
301
        d = method(librarian, slave_status, logger, send_notification)
303
 
 
304
 
        def cleanup(*args):
305
 
            del get_property_cache(self).buildqueue_record
306
 
        return d.addCallback(cleanup)
 
302
        return d
307
303
 
308
304
    def _release_builder_and_remove_queue_item(self):
309
305
        # Release the builder for another job.