also hard error if the home storage can't be created

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Sep 1, 2022 · 466edc2 · 466edc2
1 parent 1214c4f
commit 466edc2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/private/Files/Mount/MountPoint.php b/lib/private/Files/Mount/MountPoint.php
@@ -171,7 +171,9 @@ private function createStorage() {
 				$this->invalidStorage = true;
 				if ($this->mountPoint === '/') {
 					// the root storage could not be initialized, show the user!
-					throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', $exception->getCode(), $exception);
+					throw new \Exception('The root storage could not be initialized. Please contact your local administrator.', (int)$exception->getCode(), $exception);
+				} elseif (substr_count($this->mountPoint, '/') == 2) { // home mount is `/<userid/`, all extra mounts have more /'s
+					throw new \Exception('The home storage could not be initialized. Please contact your local administrator.', (int)$exception->getCode(), $exception);
 				} else {
 					\OC::$server->get(LoggerInterface::class)->error($exception->getMessage(), ['exception' => $exception]);
 				}

diff --git a/tests/lib/Files/Mount/MountPointTest.php b/tests/lib/Files/Mount/MountPointTest.php
@@ -56,7 +56,7 @@ public function testInvalidStorage() {
 		$mountPoint = new \OC\Files\Mount\MountPoint(
 			// just use this because a real class is needed
 			'\Test\Files\Mount\DummyStorage',
-			'/mountpoint',
+			'/mountpoint/test',
 			null,
 			$loader
 		);