Merge pull request #49315 from nextcloud/deleteExistingTarget

Author: provokateurin

lib/private/Files/Storage/Common.php

@@ -69,13 +69,16 @@ public function __construct(array $parameters) {
 	}
 
 	protected function remove(string $path): bool {
-		if ($this->is_dir($path)) {
-			return $this->rmdir($path);
-		} elseif ($this->is_file($path)) {
-			return $this->unlink($path);
-		} else {
-			return false;
+		if ($this->file_exists($path)) {
+			if ($this->is_dir($path)) {
+				return $this->rmdir($path);
+			} elseif ($this->is_file($path)) {
+				return $this->unlink($path);
+			} else {
+				return false;
+			}
 		}
+		return false;
 	}
 
 	public function is_dir(string $path): bool {

lib/private/Files/Storage/Local.php

@@ -342,10 +342,12 @@ public function rename(string $source, string $target): bool {
 			return false;
 		}
 
-		if ($this->is_dir($target)) {
-			$this->rmdir($target);
-		} elseif ($this->is_file($target)) {
-			$this->unlink($target);
+		if ($this->file_exists($target)) {
+			if ($this->is_dir($target)) {
+				$this->rmdir($target);
+			} elseif ($this->is_file($target)) {
+				$this->unlink($target);
+			}
 		}
 
 		if ($this->is_dir($source)) {