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 python exception raised after running in-place algorithm which requires no parameters #47108

Merged
merged 3 commits into from Feb 1, 2022

Conversation

nyalldawson
Copy link
Collaborator

unreported

@nyalldawson nyalldawson added Processing Relating to QGIS Processing framework or individual Processing algorithms backport release-3_22 labels Jan 31, 2022
@github-actions github-actions bot added this to the 3.24.0 milestone Jan 31, 2022
@nyalldawson nyalldawson merged commit cde74ac into qgis:master Feb 1, 2022
@nyalldawson nyalldawson deleted the proc_exception branch February 1, 2022 19:41
@qgis-bot
Copy link
Collaborator

qgis-bot commented Feb 1, 2022

The backport to release-3_22 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 76d41a94a3... Fix some badly formatted plural version strings
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 python/plugins/processing/ProcessingPlugin.py
[backport-47108-to-release-3_22 45d707ba18] [processing] Fix python exception raised after running in-place algorithm which requires no parameters
 Author: Nyall Dawson <nyall.dawson@gmail.com>
 Date: Tue Feb 1 09:29:48 2022 +1000
 1 file changed, 2 insertions(+), 2 deletions(-)
CONFLICT (modify/delete): src/app/options/qgscustomprojectionoptions.cpp deleted in HEAD and modified in 76d41a94a3 (Fix some badly formatted plural version strings).  Version 76d41a94a3 (Fix some badly formatted plural version strings) of src/app/options/qgscustomprojectionoptions.cpp left in tree.
Auto-merging src/app/qgisapp.cpp
Auto-merging src/core/mesh/qgsmesheditor.cpp
Auto-merging src/gui/symbology/qgsstylemanagerdialog.cpp
Auto-merging src/providers/wms/qgswmsprovider.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_22 release-3_22
# Navigate to the new working tree
cd .worktrees/backport-release-3_22
# Create a new branch
git switch --create backport-47108-to-release-3_22
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick a2c52a80259aee5858dfe6e45c6437007f18531f,76d41a94a36c0e043da8393d616f420c4a20fcc6,249eeb1b4e7db56af1a941b5845f5e080ab79fc4
# Push it to GitHub
git push --set-upstream origin backport-47108-to-release-3_22
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_22

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
failed backport The automated backport attempt failed, needs a manual backport Processing Relating to QGIS Processing framework or individual Processing algorithms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants