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 crash on invalid grass layer paths #53317

Merged
merged 3 commits into from
Jun 2, 2023

Conversation

nyalldawson
Copy link
Collaborator

Fixes #32130

Copy link
Member

@lbartoletti lbartoletti left a comment

Choose a reason for hiding this comment

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

LGTM

@lbartoletti lbartoletti merged commit 68b1aa0 into qgis:master Jun 2, 2023
36 of 37 checks passed
@qgis-bot
Copy link
Collaborator

qgis-bot commented Jun 2, 2023

The backport to release-3_28 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply f560962110... Fix grass debug output always going to error
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".

stdout
Auto-merging src/providers/grass/qgsgrass.cpp
CONFLICT (content): Merge conflict in src/providers/grass/qgsgrass.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-release-3_28 release-3_28
# Navigate to the new working tree
cd .worktrees/backport-release-3_28
# Create a new branch
git switch --create backport-53317-to-release-3_28
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick f560962110873222f4713ad5336bd8404c025282,e40cce964b15ae8fab2817147027a7eb90a8a3a2,5cf50e0d3cfaea651c72d3736f3c925008f36de6
# Push it to GitHub
git push --set-upstream origin backport-53317-to-release-3_28
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_28

Then, create a pull request where the base branch is release-3_28 and the compare/head branch is backport-53317-to-release-3_28.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jun 2, 2023
@nyalldawson nyalldawson deleted the fix_grass_invalid branch June 23, 2023 05:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Crash/Data Corruption failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

"Handle Unavailable Layers" does not handle a missing GRASS mapset when a vector is part of the project.
3 participants