From fe6407ab0bb348366a21e9ff9aee57e5cb85284d Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Thu, 25 Jul 2024 11:50:08 -0400
Subject: [PATCH] storage: Change to return Result

Prep for adding more falliable initialization here.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 lib/src/cli.rs       | 2 +-
 lib/src/install.rs   | 2 +-
 lib/src/store/mod.rs | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/src/cli.rs b/lib/src/cli.rs
index a336246e..31707cfe 100644
--- a/lib/src/cli.rs
+++ b/lib/src/cli.rs
@@ -433,7 +433,7 @@ pub(crate) async fn get_locked_sysroot() -> Result<ostree_ext::sysroot::SysrootL
 #[context("Initializing storage")]
 pub(crate) async fn get_storage() -> Result<crate::store::Storage> {
     let sysroot = get_locked_sysroot().await?;
-    Ok(crate::store::Storage::new(sysroot))
+    crate::store::Storage::new(sysroot)
 }
 
 #[context("Querying root privilege")]
diff --git a/lib/src/install.rs b/lib/src/install.rs
index 2d942cd1..cd7e068d 100644
--- a/lib/src/install.rs
+++ b/lib/src/install.rs
@@ -610,7 +610,7 @@ async fn initialize_ostree_root(state: &State, root_setup: &RootSetup) -> Result
     let sysroot = ostree::Sysroot::new(Some(&gio::File::for_path(rootfs)));
     sysroot.load(cancellable)?;
     let sysroot = SysrootLock::new_from_sysroot(&sysroot).await?;
-    Ok(Storage::new(sysroot))
+    Storage::new(sysroot)
 }
 
 #[context("Creating ostree deployment")]
diff --git a/lib/src/store/mod.rs b/lib/src/store/mod.rs
index 8a30cedc..71334177 100644
--- a/lib/src/store/mod.rs
+++ b/lib/src/store/mod.rs
@@ -48,7 +48,7 @@ impl Deref for Storage {
 }
 
 impl Storage {
-    pub fn new(sysroot: SysrootLock) -> Self {
+    pub fn new(sysroot: SysrootLock) -> Result<Self> {
         let store = match env::var("BOOTC_STORAGE") {
             Ok(val) => crate::spec::Store::from_str(&val, true).unwrap_or_else(|_| {
                 let default = crate::spec::Store::default();
@@ -60,7 +60,7 @@ impl Storage {
 
         let store = load(store);
 
-        Self { sysroot, store }
+        Ok(Self { sysroot, store })
     }
 }