Unverified Commit 06ef6b3e authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #10552 from mvdbeek/compare_by_id 

[20.01] Fix get_output_path when HDA identity changes
parents 9cd04685 6500e32f

lib/galaxy/jobs/__init__.py

+4 −3
Original line number Diff line number Diff line
@@ -1910,13 +1910,14 @@ class JobWrapper(HasResourceParameters): 
        return self.output_paths



    def get_output_path(self, dataset):

        if getattr(dataset, "fake_dataset_association", False):

            return dataset.file_name

        assert dataset.id is not None, "{} needs to be flushed to find output path".format(dataset)

        if self.output_paths is None:

            self.compute_outputs()

        for (hda, dataset_path) in self.output_hdas_and_paths.values():

            if hda == dataset:

            if hda.id == dataset.id:

                return dataset_path

        if getattr(dataset, "fake_dataset_association", False):

            return dataset.file_name

        raise KeyError("Couldn't find job output for [%s] in [%s]" % (dataset, self.output_hdas_and_paths.values()))



    def get_mutable_output_fnames(self):