packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib: handle ino cache and sepolicy options

This commit is contained in:
Felix Krull 2019-05-31 19:26:26 +02:00 committed by Colin Walters
parent eec4a2287d
commit aef78f3985
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rust-bindings/rust/src/repo_checkout_at_options.rs
View File

@ -1,6 +1,6 @@
use glib::translate::{Stash, ToGlib, ToGlibPtr}; use glib::translate::{Stash, ToGlib, ToGlibPtr};
use libc::c_char;
use ostree_sys::OstreeRepoCheckoutAtOptions; use ostree_sys::OstreeRepoCheckoutAtOptions;
use std::os::raw::c_char;
use std::path::PathBuf; use std::path::PathBuf;
use {RepoCheckoutMode, RepoCheckoutOverwriteMode}; use {RepoCheckoutMode, RepoCheckoutOverwriteMode};
use {RepoDevInoCache, SePolicy}; use {RepoDevInoCache, SePolicy};
@ -18,6 +18,7 @@ pub struct RepoCheckoutAtOptions {
pub force_copy_zerosized: bool, pub force_copy_zerosized: bool,
pub subpath: Option<PathBuf>, pub subpath: Option<PathBuf>,
pub devino_to_csum_cache: Option<RepoDevInoCache>, pub devino_to_csum_cache: Option<RepoDevInoCache>,
// TODO: those thingamajigs
// pub filter: OstreeRepoCheckoutFilter, // pub filter: OstreeRepoCheckoutFilter,
// pub filter_user_data: gpointer, // pub filter_user_data: gpointer,
pub sepolicy: Option<SePolicy>, pub sepolicy: Option<SePolicy>,
@ -62,15 +63,15 @@ impl<'a> ToGlibPtr<'a, *const OstreeRepoCheckoutAtOptions> for RepoCheckoutAtOpt
options.force_copy = self.force_copy.to_glib(); options.force_copy = self.force_copy.to_glib();
options.bareuseronly_dirs = self.bareuseronly_dirs.to_glib(); options.bareuseronly_dirs = self.bareuseronly_dirs.to_glib();
options.force_copy_zerosized = self.force_copy_zerosized.to_glib(); options.force_copy_zerosized = self.force_copy_zerosized.to_glib();
let subpath = self.subpath.to_glib_none(); let subpath = self.subpath.to_glib_none();
options.subpath = subpath.0; options.subpath = subpath.0;
let sepolicy_prefix = self.sepolicy_prefix.to_glib_none(); let sepolicy_prefix = self.sepolicy_prefix.to_glib_none();
options.sepolicy_prefix = sepolicy_prefix.0; options.sepolicy_prefix = sepolicy_prefix.0;
let devino_to_csum_cache = self.devino_to_csum_cache.to_glib_none();
/* options.devino_to_csum_cache = devino_to_csum_cache.0;
devino_to_csum_cache: None, let sepolicy = self.sepolicy.to_glib_none();
sepolicy: None, options.sepolicy = sepolicy.0;
*/
Stash(options.as_ref(), (options, subpath, sepolicy_prefix)) Stash(options.as_ref(), (options, subpath, sepolicy_prefix))
} }
@ -152,12 +153,15 @@ mod tests {
CStr::from_ptr((*ptr).subpath), CStr::from_ptr((*ptr).subpath),
CString::new("sub/path").unwrap().as_c_str() CString::new("sub/path").unwrap().as_c_str()
); );
assert_ne!((*ptr).devino_to_csum_cache, ptr::null_mut()); assert_eq!(
(*ptr).devino_to_csum_cache,
options.devino_to_csum_cache.to_glib_none().0
);
assert_eq!((*ptr).unused_ints, [0; 6]); assert_eq!((*ptr).unused_ints, [0; 6]);
assert_eq!((*ptr).unused_ptrs, [ptr::null_mut(); 3]); assert_eq!((*ptr).unused_ptrs, [ptr::null_mut(); 3]);
assert_eq!((*ptr).filter, None); assert_eq!((*ptr).filter, None);
assert_eq!((*ptr).filter_user_data, ptr::null_mut()); assert_eq!((*ptr).filter_user_data, ptr::null_mut());
assert_ne!((*ptr).sepolicy, ptr::null_mut()); assert_eq!((*ptr).sepolicy, options.sepolicy.to_glib_none().0);
assert_eq!( assert_eq!(
CStr::from_ptr((*ptr).sepolicy_prefix), CStr::from_ptr((*ptr).sepolicy_prefix),
CString::new("prefix").unwrap().as_c_str() CString::new("prefix").unwrap().as_c_str()

2
rust-bindings/rust/tests/repo.rs
View File

@ -99,6 +99,7 @@ fn should_checkout_tree() {
} }
#[test] #[test]
#[cfg(feature = "v2016_8")]
fn should_checkout_at_with_none_options() { fn should_checkout_at_with_none_options() {
let test_repo = TestRepo::new(); let test_repo = TestRepo::new();
let checksum = test_repo.test_commit("test"); let checksum = test_repo.test_commit("test");
@ -120,6 +121,7 @@ fn should_checkout_at_with_none_options() {
} }
#[test] #[test]
#[cfg(feature = "v2016_8")]
fn should_checkout_at_with_options() { fn should_checkout_at_with_options() {
let test_repo = TestRepo::new(); let test_repo = TestRepo::new();
let checksum = test_repo.test_commit("test"); let checksum = test_repo.test_commit("test");