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

RASTER: fix gh54702 crash on wcs bad layers #54707

Merged

Conversation

elpaso
Copy link
Contributor

@elpaso elpaso commented Sep 22, 2023

Fixes a crash on bad GDAL raster layers when the user chooses to keep it.

Fix #54702

@elpaso elpaso added Bug Either a bug report, or a bug fix. Let's hope for the latter! backport queued_ltr_backports Queued Backports labels Sep 22, 2023
@github-actions github-actions bot added this to the 3.34.0 milestone Sep 22, 2023
@nyalldawson
Copy link
Collaborator

@elpaso low risk crash fixes like these should skip the queued branch 👍

@nyalldawson nyalldawson merged commit 42c9d5a into qgis:master Sep 22, 2023
42 checks passed
@qgis-bot
Copy link
Collaborator

The backport to release-3_28 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 5d18be498d... Test for isse #54702
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/wcs/qgswcsprovider.cpp
[backport-54707-to-release-3_28 40b9d44705] Fix crash on WCS bad layers
 Author: Alessandro Pasotti <elpaso@itopen.it>
 Date: Fri Sep 22 14:07:46 2023 +0200
 2 files changed, 6 insertions(+), 1 deletion(-)
Auto-merging tests/src/python/test_provider_gdal.py
CONFLICT (content): Merge conflict in tests/src/python/test_provider_gdal.py

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-54707-to-release-3_28
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 4c36f297deaf9f31b702aed99df3af450c44055c,5d18be498dddb44c519fb2a3f444edc17b3672c1
# Push it to GitHub
git push --set-upstream origin backport-54707-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-54707-to-release-3_28.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Sep 22, 2023
elpaso added a commit to elpaso/QGIS that referenced this pull request Oct 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Either a bug report, or a bug fix. Let's hope for the latter! failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

WCS Keep Unavailable Layers
3 participants