Merge pull request #891 from cgwalters/no-hard-require-usrlibbootc

jmarrero · web-flow · commit c4f3e33cade6 · 2024-11-08T17:29:17.000-05:00
kargs: Handle when kargs.d doesn't exist
diff --git a/lib/src/kargs.rs b/lib/src/kargs.rs
@@ -61,6 +61,9 @@ pub(crate) fn get_kargs_from_ostree_root(
 ) -> Result<Vec<String>> {
     let kargsd = root.resolve_relative_path(KARGS_PATH);
     let kargsd = kargsd.downcast_ref::<ostree::RepoFile>().expect("downcast");
+    if !kargsd.query_exists(gio::Cancellable::NONE) {
+        return Ok(Default::default());
+    }
     get_kargs_from_ostree(repo, kargsd, sys_arch)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,9 @@ pub(crate) fn get_kargs_from_ostree_root(`
`61`	`61`	`) -> Result<Vec<String>> {`
`62`	`62`	`let kargsd = root.resolve_relative_path(KARGS_PATH);`
`63`	`63`	`let kargsd = kargsd.downcast_ref::<ostree::RepoFile>().expect("downcast");`
	`64`	`+ if !kargsd.query_exists(gio::Cancellable::NONE) {`
	`65`	`+ return Ok(Default::default());`
	`66`	`+ }`
`64`	`67`	`get_kargs_from_ostree(repo, kargsd, sys_arch)`
`65`	`68`	`}`
`66`	`69`