moss: Adapt boot.rs to the new fnmatch API

serpent-os · Jul 26, 2024 · d9402b8 · d9402b8
1 parent 171ea97
commit d9402b8
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/moss/src/client/boot.rs b/moss/src/client/boot.rs
@@ -28,10 +28,6 @@ pub enum Error {
     #[error("os_release: {0}")]
     OsRelease(#[from] os_release::Error),
 
-    /// fnmatch pattern compilation for boot, etc.
-    #[error("fnmatch pattern: {0}")]
-    Pattern(#[from] fnmatch::Error),
-
     #[error("incomplete kernel tree: {0}")]
     IncompleteKernel(String),
 }
@@ -62,15 +58,15 @@ fn kernel_files_from_state<'a>(
     for (_, path) in layouts.iter() {
         match &path.entry {
             layout::Entry::Regular(_, target) => {
-                if pattern.match_path(target).is_some() {
+                if pattern.matches(target).is_some() {
                     kernel_entries.push(KernelCandidate {
                         path: install.root.join("usr").join(target),
                         _layout: path,
                     });
                 }
             }
             layout::Entry::Symlink(_, target) => {
-                if pattern.match_path(target).is_some() {
+                if pattern.matches(target).is_some() {
                     kernel_entries.push(KernelCandidate {
                         path: install.root.join("usr").join(target),
                         _layout: path,
@@ -94,7 +90,7 @@ fn boot_files_from_state<'a>(
 
     for (_, path) in layouts.iter() {
         if let layout::Entry::Regular(_, target) = &path.entry {
-            if pattern.match_path(target).is_some() {
+            if pattern.matches(target).is_some() {
                 rets.push(install.root.join("usr").join(target));
             }
         }
@@ -116,8 +112,8 @@ pub fn synchronize(install: &Installation, layouts: &[(Id, Layout)]) -> Result<(
         vfs: "/".into(),
     };
 
-    let pattern = fnmatch::Pattern::from_str("lib/kernel/(version:*)/*")?;
-    let systemd = fnmatch::Pattern::from_str("lib*/systemd/boot/efi/*.efi")?;
+    let pattern = fnmatch::Pattern::from_str("lib/kernel/(version:*)/*").unwrap(); // TODO: Do not return Infallible?
+    let systemd = fnmatch::Pattern::from_str("lib*/systemd/boot/efi/*.efi").unwrap(); // TODO: Do not return Infallible?
     let booty_bits = boot_files_from_state(install, layouts, &systemd);
 
     // No kernels? No bother.