Unverified Commit 601cd783 authored by mvdbeek's avatar mvdbeek
Browse files

Merge branch 'release_20.09' into release_21.01

parents e905161c bb0da5f1

lib/galaxy/jobs/__init__.py

+4 −4
Original line number Diff line number Diff line
@@ -1102,10 +1102,10 @@ class JobWrapper(HasResourceParameters): 
        job = self._load_job()



        def get_special():

            special = self.sa_session.query(model.JobExportHistoryArchive).filter_by(job=job).first()

            if not special:

                special = self.sa_session.query(model.GenomeIndexToolData).filter_by(job=job).first()

            return special

            jeha = self.sa_session.query(model.JobExportHistoryArchive).filter_by(job=job).first()

            if jeha:

                return jeha.fda

            return self.sa_session.query(model.GenomeIndexToolData).filter_by(job=job).first()



        tool_evaluator = self._get_tool_evaluator(job)

        compute_environment = compute_environment or self.default_compute_environment(job)

lib/galaxy/tools/evaluation.py

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ class ToolEvaluator: 
        if get_special:

            special = get_special()

            if special:

                out_data["output_file"] = special.fda

                out_data["output_file"] = special



        # These can be passed on the command line if wanted as $__user_*__

        incoming.update(model.User.user_template_environment(job.history and job.history.user))