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.

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

Check for naming conflicts before returning the user mounts #1239

Merged
merged 2 commits into from
Mar 5, 2021
Merged

Check for naming conflicts before returning the user mounts #1239

merged 2 commits into from
Mar 5, 2021

Conversation

icewind1991
Copy link
Member

@icewind1991 icewind1991 commented Jan 22, 2021 •
edited by ChristophWurst

New try for #523 by working on storage level instead of triggering the filesystem setup this should prevent issues caused by cyclic setup

Fixes #648

@icewind1991 icewind1991 added the 3. to review Items that need to be reviewed label Jan 22, 2021
@ChristophWurst ChristophWurst mentioned this pull request Jan 29, 2021
Closed
@icewind1991 icewind1991 force-pushed the conflict-prevention branch 2 times, most recently from 8bdcff1 to 1185234 Compare January 29, 2021 15:18
@icewind1991 @juliushaertl
Check for naming conflicts before returning the user mounts
309de47 
Signed-off-by: Robin Appelman <robin@icewind.nl>
@juliushaertl
Update psalm baseline
3e208db 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
Copy link
Member

Rebased and updated psalm baseline since the IMountPoint interface currently leaks a private class as return value:

ERROR: UndefinedDocblockClass - lib/Mount/MountProvider.php:107:20 - Docblock-defined class or interface OC\Files\Storage\Storage does not exist (see psalm.dev/200)
				$userStorage = $this->mountProviderCollection->getHomeMountForUser($user)->getStorage();

@juliushaertl
Copy link
Member

/backport to stable21

@juliushaertl
Copy link
Member

/backport to stable20

@juliushaertl
Copy link
Member

/backport to stable19

@juliushaertl juliushaertl merged commit aabb7b8 into master Mar 5, 2021
@juliushaertl juliushaertl deleted the conflict-prevention branch March 5, 2021 09:54
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Mar 5, 2021
Merged
@backportbot-nextcloud
Copy link

The backport to stable20 failed. Please do this backport manually.

@backportbot-nextcloud
Copy link

The backport to stable19 failed. Please do this backport manually.

This was referenced Mar 5, 2021
Merged
Merged
Merged
@fschrempf fschrempf mentioned this pull request Mar 14, 2021
Closed
@icewind1991 icewind1991 mentioned this pull request Mar 15, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@juliushaertl juliushaertl juliushaertl approved these changes

@rullzer rullzer Awaiting requested review from rullzer

Assignees
No one assigned
Labels
3. to review Items that need to be reviewed bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Collision detection for group folder target
2 participants
@icewind1991 @juliushaertl