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

Merge pull request #19480 from mvdbeek/improve_relabel_from_file_error 

[24.1] Improve relabel from file error if file doesn't contain enough lines
parents f4cb6806 889ff345

lib/galaxy/tools/__init__.py

+4 −0
Original line number Diff line number Diff line
@@ -3872,6 +3872,10 @@ class RelabelFromFileTool(DatabaseOperationTool): 
                add_copied_value_to_new_elements(new_label, dce_object)

        else:

            # If new_labels_dataset_assoc is not a two-column tabular dataset we label with the current line of the dataset

            if hdca.collection.element_count > len(new_labels):

                raise exceptions.MessageException(

                    "Relabel mapping file contains less lines than there are collection elements to relabel."

                )

            for i, dce in enumerate(hdca.collection.elements):

                dce_object = dce.element_object

                add_copied_value_to_new_elements(new_labels[i], dce_object)