Skip to content

Commit

Permalink
Merge pull request #822 from cgwalters/kargs-test-no-xattrs
Browse files Browse the repository at this point in the history
kargs: Skip xattrs in tests
  • Loading branch information
cgwalters authored Oct 14, 2024
2 parents 479daa9 + bd376eb commit 1212f32
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions lib/src/kargs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,16 @@ match-architectures = ["x86_64", "aarch64"]
let txn = repo.auto_transaction(cancellable)?;

let mt = ostree::MutableTree::new();
repo.write_dfd_to_mtree(d.as_fd().as_raw_fd(), path.as_str(), &mt, None, cancellable)
.context("Writing merged filesystem to mtree")?;
let commitmod_flags = ostree::RepoCommitModifierFlags::SKIP_XATTRS;
let commitmod = ostree::RepoCommitModifier::new(commitmod_flags, None);
repo.write_dfd_to_mtree(
d.as_fd().as_raw_fd(),
path.as_str(),
&mt,
Some(&commitmod),
cancellable,
)
.context("Writing merged filesystem to mtree")?;

let merged_root = repo
.write_mtree(&mt, cancellable)
Expand Down

0 comments on commit 1212f32

Please sign in to comment.