Merge pull request #32324 from owncloud/stable10-9e0c856148b286b8f738…

…66a5c74f485c8294b7c5 [stable10] Fixes #32270 - continue with upgrade even if the market ap…
owncloud · Aug 14, 2018 · dd6da85 · dd6da85
2 parents 5618d92 + 712ac5b
commit dd6da85
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/private/Repair/Apps.php b/lib/private/Repair/Apps.php
@@ -325,7 +325,12 @@ private function fixMarketAppState(IOutput $output) {
 
 		// Then we need to enable the market app to support app updates / downloads during upgrade
 		$output->info('Enabling market app to assist with update');
-		$this->appManager->enableApp('market');
-		return true;
+		try {
+			$this->appManager->enableApp('market');
+			return true;
+		} catch (\Exception $ex) {
+			$output->warning($ex->getMessage());
+			return false;
+		}
 	}
 }