Merge pull request #27973 from owncloud/dont-kill-app-git-clones

Don't overwrite a git clone of an app with code from the marketplace
owncloud · May 22, 2017 · cb6f4a2 · cb6f4a2
2 parents 31b0c41 + 113abf3
commit cb6f4a2
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
@@ -44,6 +44,7 @@
 use OC_App;
 use OC_DB;
 use OC_Helper;
+use OCP\App\AppAlreadyInstalledException;
 
 /**
  * This class provides the functionality needed to install, update and remove plugins/apps
@@ -222,6 +223,9 @@ public static function updateApp($info= [], $isShipped=false) {
 		if($currentDir !== false && is_writable($currentDir)) {
 			$basedir = $currentDir;
 		}
+		if(is_dir("$basedir/.git")) {
+			throw new AppAlreadyInstalledException("App <{$info['id']}> is a git clone - it will not be updated.");
+		}
 		if(is_dir($basedir)) {
 			OC_Helper::rmdirr($basedir);
 		}