Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix incorrect attempts to load outputs from models to projects #57701

Merged
merged 3 commits into from
Jun 7, 2024

Conversation

nyalldawson
Copy link
Collaborator

Fixes #57698

We should first check whether each individual output is set to
load into the project before setting properties relating to
loading the output, otherwise they all get appended to the
add to project list.

Fixes qgis#57698
If true, then the evaluated result won't be treated as an actual layer to load
This is an advance test only, and shouldn't result in layers
attempting to add to the project.

Refs qgis#57698
@github-actions github-actions bot added this to the 3.38.0 milestone Jun 7, 2024
Copy link

github-actions bot commented Jun 7, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit dcf88dd)

Copy link
Contributor

@pathmapper pathmapper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's cool, you post an issue just before you go to sleep and when you wake up it's fixed 😄

Thanks @nyalldawson, confirmed this fixes #57698 and additionally also #54865 🎉

@nyalldawson nyalldawson merged commit 4986525 into qgis:master Jun 7, 2024
36 checks passed
@nyalldawson nyalldawson deleted the fix_57698 branch June 7, 2024 08:44
@qgis-bot
Copy link
Collaborator

qgis-bot commented Jun 7, 2024

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply ed5a41f4082... Fix all outputs from models are set to load into project
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging src/core/processing/models/qgsprocessingmodelalgorithm.cpp
CONFLICT (content): Merge conflict in src/core/processing/models/qgsprocessingmodelalgorithm.cpp
Auto-merging tests/src/analysis/testqgsprocessingmodelalgorithm.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-queued_ltr_backports queued_ltr_backports
# Navigate to the new working tree
cd .worktrees/backport-queued_ltr_backports
# Create a new branch
git switch --create backport-57701-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ed5a41f4082b4a0c6a1d501b96780ab610c60f25,e6baabe229e9eec8bc7f1732881c1e79475636ad,dcf88ddb8ddecd3b964850b78acb2d5e354e54aa
# Push it to GitHub
git push --set-upstream origin backport-57701-to-queued_ltr_backports
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-queued_ltr_backports

Then, create a pull request where the base branch is queued_ltr_backports and the compare/head branch is backport-57701-to-queued_ltr_backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Model in model: misleading error message
4 participants