Cope with stray files in the rsync collector’s directory.

src/collector/rsync.rs

@@ -364,7 +364,7 @@ impl<'a> Run<'a> {
             };
 
             if !keep {
-                fatal::remove_dir_all(entry.path())?;
+                fatal::remove_all(entry.path())?;
             }
         }
 
@@ -395,7 +395,7 @@ impl<'a> Run<'a> {
             };
 
             if !keep {
-                fatal::remove_dir_all(entry.path())?;
+                fatal::remove_all(entry.path())?;
             }
             else {
                 keep_host = true;

src/utils/fatal.rs

@@ -214,6 +214,19 @@ pub fn remove_file(path: &Path) -> Result<(), Failed> {
 }
 
 
+//------------ remove_all ----------------------------------------------------
+
+/// Removes a file or a directory tree.
+pub fn remove_all(path: &Path) -> Result<(), Failed> {
+    if path.is_dir() {
+        remove_dir_all(path)
+    }
+    else {
+        remove_file(path)
+    }
+}
+
+
 //------------ rename --------------------------------------------------------
 
 /// Renames a file or directory.