[25.1] Fix loading non-tool files from watched tool directories#21880
Merged
jmchilton merged 1 commit intogalaxyproject:release_25.1from Feb 18, 2026
Merged
[25.1] Fix loading non-tool files from watched tool directories#21880jmchilton merged 1 commit intogalaxyproject:release_25.1from
jmchilton merged 1 commit intogalaxyproject:release_25.1from
Conversation
The quick_load callback in __watch_directory is used both during the initial directory scan (where _looks_like_a_tool is checked beforehand) and as a callback for the ToolWatcher (where no such check occurs). When the watcher detects a file system event for any .xml file in a watched directory, it calls quick_load directly without verifying the file is actually a tool. This causes files like macros.xml to be loaded as tools and fail with "Missing tool 'id'" errors. Add a _looks_like_a_tool guard inside quick_load itself so the check is always applied regardless of the caller.
github-project-automation
Bot
moved this from Needs Review
to Done
in Galaxy Dev - weeklies
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The quick_load callback in __watch_directory is used both during the initial directory scan (where _looks_like_a_tool is checked beforehand) and as a callback for the ToolWatcher (where no such check occurs). When the watcher detects a file system event for any .xml file in a watched directory, it calls quick_load directly without verifying the file is actually a tool. This causes files like macros.xml to be loaded as tools and fail with "Missing tool 'id'" errors.
Add a _looks_like_a_tool guard inside quick_load itself so the check is always applied regardless of the caller.
Noticed in planemo CI.
How to test the changes?
(Select all options that apply)
License