Make cancel from CatFileBatch and CatFileBatchCheck wait for the command to end (#16479) #16481
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…and to end Fix go-gitea#16427 (again!) Signed-off-by: Andrew Thornton <art27@cantab.net>
|
Windows users please try: https://www.eldritchkitty.com/~andrew/gitea-1.14.5-16481-windows-4.0-amd64.zip which contains a build of 1.14 with the above PR and it's gpg signature. |
This was referenced Jul 18, 2021
Signed-off-by: Andrew Thornton <art27@cantab.net>
Signed-off-by: Andrew Thornton <art27@cantab.net>
lafriks
approved these changes
Jul 20, 2021
6543
approved these changes
Jul 21, 2021
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Aug 4, 2021
[1.14.6](https://github.com/go-gitea/gitea/releases/tag/v1.14.6) - 2021-08-04 * SECURITY * Bump github.com/markbates/goth from v1.67.1 to v1.68.0 (go-gitea#16538) (go-gitea#16540) * Switch to maintained JWT lib (go-gitea#16532) (go-gitea#16535) * Upgrade to latest version of golang-jwt (as forked for 1.14) (go-gitea#16590) (go-gitea#16607) * BUGFIXES * Add basic edit ldap auth test & actually fix go-gitea#16252 (go-gitea#16465) (go-gitea#16495) * Make cancel from CatFileBatch and CatFileBatchCheck wait for the command to end (go-gitea#16479) (go-gitea#16481) Signed-off-by: Andrew Thornton <art27@cantab.net>
Merged
zeripath
added a commit
that referenced
this pull request
Aug 5, 2021
## [1.14.6](https://github.com/go-gitea/gitea/releases/tag/v1.14.6) - 2021-08-04 * SECURITY * Bump github.com/markbates/goth from v1.67.1 to v1.68.0 (#16538) (#16540) * Switch to maintained JWT lib (#16532) (#16535) * Upgrade to latest version of golang-jwt (as forked for 1.14) (#16590) (#16607) * BUGFIXES * Add basic edit ldap auth test & actually fix #16252 (#16465) (#16495) * Make cancel from CatFileBatch and CatFileBatchCheck wait for the command to end (#16479) (#16481) Signed-off-by: Andrew Thornton <art27@cantab.net>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport #16479
Unfortunately, it appears like #16435 still isn't enough. This PR adjusts the cancel functions to make them block till the end of the command in the hopes that this finally allows windows to rename the directory.
Fix #16427 (again!)
Fix #16475
Signed-off-by: Andrew Thornton art27@cantab.net