Unverified Commit 1ad49865 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #16504 from bernt-matthias/fix/upload-param-file 

[23.0] Fix upload paramfile handling (for real user setups)
parents 2fbbfd84 ad5a1739

lib/galaxy/tools/evaluation.py

+5 −2
Original line number Diff line number Diff line
@@ -190,8 +190,6 @@ class ToolEvaluator: 
        param_dict["__datatypes_config__"] = param_dict["GALAXY_DATATYPES_CONF_FILE"] = os.path.join(

            job_working_directory, "registry.xml"

        )

        if self.job.tool_id == "upload1":

            param_dict["paramfile"] = os.path.join(job_working_directory, "upload_params.json")

        if self._history:

            param_dict["__history_id__"] = self.app.security.encode_id(self._history.id)

        param_dict["__galaxy_url__"] = self.compute_environment.galaxy_url()
@@ -209,6 +207,11 @@ class ToolEvaluator: 
        # Parameters added after this line are not sanitized

        self.__populate_non_job_params(param_dict)



        # MinimalJobWrapper.__prepare_upload_paramfile copies the paramfile to the job working directory

        # so we should use it (otherwise the upload tool does not work in real user setups)

        if self.job.tool_id == "upload1":

            param_dict["paramfile"] = os.path.join(job_working_directory, "upload_params.json")



        # Return the dictionary of parameters

        return param_dict