From 9dcd23354ec74daf4000ec40bd52a33341a16cd8 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 27 Nov 2021 09:57:54 +0200
Subject: feat! turn errors from backup root directory into errors

Previously an error from, say, a missing backup root directory was
reported to the user as a warning. Turn it into an error. However,
errors reading a file or directory inside the backup root should still
be just a warning.

Sponsored-by: author
---
 src/backup_run.rs | 11 +++++++++--
 src/generation.rs |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/backup_run.rs b/src/backup_run.rs
index fb823be..0853bdf 100644
--- a/src/backup_run.rs
+++ b/src/backup_run.rs
@@ -164,9 +164,8 @@ impl<'a> BackupRun<'a> {
                         }
                     }
                     Err(err) => {
-                        debug!("ignoring backup error {}", err);
-                        warnings.push(err.into());
                         self.found_problem();
+                        return Err(err.into());
                     }
                 }
             }
@@ -193,9 +192,16 @@ impl<'a> BackupRun<'a> {
         let mut warnings: Vec<BackupError> = vec![];
         let mut new_cachedir_tags = vec![];
         let iter = FsIterator::new(root, config.exclude_cache_tag_directories);
+        let mut first_entry = true;
         for entry in iter {
             match entry {
                 Err(err) => {
+                    if first_entry {
+                        // Only the first entry (the backup root)
+                        // failing is an error. Everything else is a
+                        // warning.
+                        return Err(NascentError::BackupRootFailed(root.to_path_buf(), err));
+                    }
                     warnings.push(err.into());
                 }
                 Ok(entry) => {
@@ -217,6 +223,7 @@ impl<'a> BackupRun<'a> {
                     }
                 }
             }
+            first_entry = false;
         }
 
         Ok(OneRootBackupOutcome {
diff --git a/src/generation.rs b/src/generation.rs
index 33750ca..6613c02 100644
--- a/src/generation.rs
+++ b/src/generation.rs
@@ -53,6 +53,9 @@ pub struct NascentGeneration {
 
 #[derive(Debug, thiserror::Error)]
 pub enum NascentError {
+    #[error("Could not back up a backup root directory: {0}: {1}")]
+    BackupRootFailed(PathBuf, crate::fsiter::FsIterError),
+
     #[error(transparent)]
     LocalGenerationError(#[from] LocalGenerationError),
 
-- 
cgit v1.2.1