1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/ce2f405062f6/ Changeset: ce2f405062f6 User: dannon Date: 2015-01-30 19:19:16+00:00 Summary: Merged in kellrott/galaxy-farm (pull request #654)
Fixing provenance api request bug when data element has job == None Affected #: 1 file
diff -r 18dacdf8674e21c5e9a2bb61036382e44f6842bc -r ce2f405062f677cf826a4cac0647a0e0f8beef65 lib/galaxy/webapps/galaxy/api/provenance.py --- a/lib/galaxy/webapps/galaxy/api/provenance.py +++ b/lib/galaxy/webapps/galaxy/api/provenance.py @@ -52,15 +52,21 @@ if item.copied_from_library_dataset_dataset_association: item = item.copied_from_library_dataset_dataset_association job = item.creating_job - return { - "id": trans.security.encode_id(item.id), - "uuid": ( lambda uuid: str( uuid ) if uuid else None )( item.dataset.uuid), - "job_id": trans.security.encode_id( job.id ), - "tool_id": job.tool_id, - "parameters": self._get_job_record(trans, job, follow), - "stderr": job.stderr, - "stdout": job.stdout, - } + if job is not None: + return { + "id": trans.security.encode_id(item.id), + "uuid": ( lambda uuid: str( uuid ) if uuid else None )( item.dataset.uuid), + "job_id": trans.security.encode_id( job.id ), + "tool_id": job.tool_id, + "parameters": self._get_job_record(trans, job, follow), + "stderr": job.stderr, + "stdout": job.stdout, + } + else: + return { + "id": trans.security.encode_id(item.id), + "uuid": ( lambda uuid: str( uuid ) if uuid else None )( item.dataset.uuid) + } return None
def _get_job_record(self, trans, job, follow):
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.