fix(storage): Try to delete existing target

Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index d2a344a8217aa5511522486e4e9d138f94d28792..cff19e33dcef072b00f2207c4851d702254c151b 100644 (file)
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -108,13 +108,14 @@ abstract class Common implements Storage, ILockingStorage, IWriteStreamStorage {
         * @return bool
         */
        protected function remove($path) {
-               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);
+                       }
                }
+               return false;
        }
 
        public function is_dir($path) {

diff --git a/lib/private/Files/Storage/Local.php b/lib/private/Files/Storage/Local.php
index ca2113add75d0aa2fc22c6363b1d400a5c35d8e8..8fec24996891f134885cc99e74cafb41fe99e5d1 100644 (file)
--- a/lib/private/Files/Storage/Local.php
+++ b/lib/private/Files/Storage/Local.php
@@ -380,10 +380,12 @@ class Local extends \OC\Files\Storage\Common {
                        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)) {