← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

merge changes from db-devel

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/buildmaster/model/builder.py
128
128
        logger.debug("Asking builder on %s to ensure it has file %s "
129
129
                     "(%s, %s)" % (self.urlbase, libraryfilealias.filename,
130
130
                                   url, libraryfilealias.content.sha1))
131
 
        self._sendFileToSlave(url, libraryfilealias.content.sha1)
 
131
        self.sendFileToSlave(libraryfilealias.content.sha1, url)
132
132
 
133
 
    def _sendFileToSlave(self, url, sha1, username="", password=""):
 
133
    def sendFileToSlave(self, sha1, url, username="", password=""):
134
134
        """Helper to send the file at 'url' with 'sha1' to this builder."""
135
135
        present, info = self.ensurepresent(sha1, url, username, password)
136
136
        if not present:
365
365
        """See IBuilder."""
366
366
        return self.slave.status()
367
367
 
 
368
    def verifySlaveBuildID(self, slave_build_id):
 
369
        """See `IBuilder`."""
 
370
        return self.current_build_behavior.verifySlaveBuildID(slave_build_id)
 
371
 
368
372
    def updateBuild(self, queueItem):
369
373
        """See `IBuilder`."""
370
374
        self.current_build_behavior.updateBuild(queueItem)