[stable25] fix: catch ManuallyLockedException and use app context #38044
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
backportbot-nextcloud
bot
requested review from
artonge,
juliusknorr and
max-nextcloud
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| $storage1->unlink($internalPath1); | ||
| try { | ||
| // TODO add a proper way of overwriting a file while maintaining file ids | ||
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion
| $storage1->unlink($internalPath1); | ||
| try { | ||
| // TODO add a proper way of overwriting a file while maintaining file ids | ||
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { |
Check notice
Code scanning / Psalm
ArgumentTypeCoercion
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { | ||
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
| if ($storage1->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage') || $storage2->instanceOfStorage('\OC\Files\ObjectStore\ObjectStoreStorage')) { | ||
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
| $source = $storage1->fopen($internalPath1, 'r'); | ||
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); | ||
| fclose($source); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
| $target = $storage2->fopen($internalPath2, 'w'); | ||
| [, $result] = \OC_Helper::streamCopy($source, $target); | ||
| fclose($source); | ||
| fclose($target); |
Check notice
Code scanning / Psalm
PossiblyInvalidArgument
The files_lock app may throw ManuallyLockedExceptions when attempting to revert a file that is currently opened. This would prevent the user from rolling back a opened file. Text and Richdocuments handle changes of the file while editing. Allow reverting files even when they are locked by these apps and let the apps handle the conflict. Signed-off-by: Max <[email protected]>
max-nextcloud
force-pushed
the
backport/37787/stable25
branch
from
97fbc66 to
7f2de58
Compare
max-nextcloud
approved these changes
May 4, 2023
Contributor
|
/backport to stable24 |
artonge
approved these changes
May 4, 2023
Author
|
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 of #37787