global-functions.rsc

@@ -1205,12 +1205,10 @@
   }
 
   :onerror Err {
-    /file/remove [ find where name=$DirName ];
+    /file/remove $DirName;
   } do={
-    :if (!($Err ~ "no such item")) do={
+    $LogPrint error $0 ("Removing directory '" . $DirName . "' failed: " . $Err);
-      $LogPrint error $0 ("Removing directory '" . $DirName . "' failed: " . $Err);
+    :return false;
-      :return false;
-    }
   }
   :return true;
 }
@@ -1236,12 +1234,10 @@
   }
 
   :onerror Err {
-    /file/remove [ find where name=$FileName ];
+    /file/remove $FileName;
   } do={
-    :if (!($Err ~ "no such item")) do={
+    $LogPrint error $0 ("Removing file '" . $FileName . "' failed: " . $Err);
-      $LogPrint error $0 ("Removing file '" . $FileName . "' failed: " . $Err);
+    :return false;
-      :return false;
-    }
   }
   :return true;
 }