8000 fix: Fix patch not being executed (backport #32524) by mergify[bot] · Pull Request #32531 · frappe/frappe · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: Fix patch not being executed (backport #32524) #32531

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

fix: Fix patch not being executed (backport #32524) #32531

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor
@mergify mergify bot commented May 15, 2025

untested

exec won't do anything but fail here, i would assume

https://github.com/frappe/frappe/blob/develop/frappe/modules/patch_handler.py#L190

This is an automatic backport of pull request #32524 done by Mergify.

@cogk @mergify
fix: Fix patch not being executed (#32524)
a538fff 
(cherry picked from commit 4eb8f91)

# Conflicts:
#	frappe/patches.txt
@mergify mergify bot added the conflicts label May 15, 2025
@mergify Mergify
Copy link
Contributor Author
mergify bot commented May 15, 2025

Cherry-pick of 4eb8f91 has failed:

On branch mergify/bp/version-15-hotfix/pr-32524
Your branch is up to date with 'origin/version-15-hotfix'.

You are currently cherry-picking commit 4eb8f91a85.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   frappe/patches.txt

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@stale Stale
Copy link
stale bot commented Jun 13, 2025

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing.

@stale stale bot added the inactive label Jun 13, 2025
@stale stale bot closed this Jun 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
conflicts inactive
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@cogk
0