Mercurial > bitten > bitten-test
comparison bitten/slave.py @ 906:0ab6b21b8010 0.6.x
0.6dev: Merged [987] from trunk.
| author | osimons |
|---|---|
| date | Wed, 30 Mar 2011 13:32:30 +0000 |
| parents | ba551c60cf06 |
| children | 5bfdd7348d6f |
comparison
equal
deleted
inserted
replaced
| 904:288791ac7f02 | 906:0ab6b21b8010 |
|---|---|
| 502 | 502 |
| 503 def _attach_file(self, build_url, recipe, attachment): | 503 def _attach_file(self, build_url, recipe, attachment): |
| 504 form_token = recipe._root.attr.get('form_token', '') | 504 form_token = recipe._root.attr.get('form_token', '') |
| 505 if self.local or self.dry_run or not form_token: | 505 if self.local or self.dry_run or not form_token: |
| 506 log.info('Attachment %s not sent due to current slave options', | 506 log.info('Attachment %s not sent due to current slave options', |
| 507 attachment.attr['file']) | 507 attachment.attr['filename']) |
| 508 return | 508 return |
| 509 resource_type = attachment.attr['resource'] | 509 resource_type = attachment.attr['resource'] |
| 510 url = str(build_url + '/attach/' + resource_type) | 510 url = str(build_url + '/attach/' + resource_type) |
| 511 path = recipe.ctxt.resolve(attachment.attr['filename']) | 511 path = recipe.ctxt.resolve(attachment.attr['filename']) |
| 512 filename = os.path.basename(path) | 512 filename = os.path.basename(path) |