# HG changeset patch # User cmlenz # Date 1124655109 0 # Node ID b2623edffb194cc6effc7a31b26fbe76baa294cb # Parent f3f5895e373ce2a6e987ce4b014a33b1a020724c Another fix to recipe handling by build slave. diff --git a/bitten/slave.py b/bitten/slave.py --- a/bitten/slave.py +++ b/bitten/slave.py @@ -58,6 +58,7 @@ def handle_connect(self): """Register with the build master.""" + self.recipe_xml = None def handle_reply(cmd, msgno, ansno, payload): if cmd == 'ERR': @@ -104,11 +105,10 @@ self.channel.send_msg(beep.Payload(xml), handle_reply) def handle_msg(self, msgno, payload): - recipe_xml = None if payload.content_type == beep.BEEP_XML: elem = xmlio.parse(payload.body) if elem.name == 'build': - recipe_xml = elem + self.recipe_xml = elem # Received a build request xml = xmlio.Element('proceed')[ xmlio.Element('accept', type='application/tar', @@ -156,7 +156,7 @@ for filename in files: os.chmod(os.path.join(root, filename), 0400) - self.execute_build(msgno, Recipe(recipe_xml, path)) + self.execute_build(msgno, Recipe(self.recipe_xml, path)) def execute_build(self, msgno, recipe): global log