← Back to branch summary

~canonical-launchpad-branches/launchpad-buildd/trunk

« back to all changes in this revision

Viewing changes to lpbuildd/slave.py

  • Committer: Colin Watson
  • Date: 2017-04-03 12:30:15 UTC
  • mto: This revision was merged to the branch mainline in revision 216.
  • Revision ID: cjwatson@canonical.com-20170403123015-18our0f4alofcjs0
https://launchpad.net/bugs/1679157
Record the branch revision used to build a snap and return it along with
other XML-RPC status information (LP: #1679157).

Show diffs side-by-side

added added

removed removed

Lines of Context:
lpbuildd/slave.py
199
199
 
200
200
        self.runSubProcess(self._preppath, ["slave-prep"])
201
201
 
 
202
    def status(self):
 
203
        """Return extra status for this build manager, as a dictionary.
 
204
 
 
205
        This may be used to return manager-specific information from the
 
206
        XML-RPC status call.
 
207
        """
 
208
        return {}
 
209
 
202
210
    def iterate(self, success):
203
211
        """Perform an iteration of the slave.
204
212
 
309
317
        self.waitingfiles = {}
310
318
        self.builddependencies = ""
311
319
        self._log = None
 
320
        self.manager = None
312
321
 
313
322
        if not os.path.isdir(self._cachepath):
314
323
            raise ValueError("FileCache path is not a dir")
665
674
        if self._version is not None:
666
675
            ret["builder_version"] = self._version
667
676
        ret.update(func())
 
677
        if self.slave.manager is not None:
 
678
            ret.update(self.slave.manager.status())
668
679
        return ret
669
680
 
670
681
    def status_IDLE(self):