Skip to content

Commit 8534450

Browse files
committed
ostree-ext: Rename helper for clarity
Prep for next patch. Signed-off-by: Colin Walters <[email protected]>
1 parent 82760fe commit 8534450

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

ostree-ext/src/tar/export.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,13 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
347347
Ok(())
348348
}
349349

350-
/// Export xattrs to the tar stream, return whether content was written.
350+
/// Export xattrs in ostree-container style format, which is a .xattrs file.
351+
/// This is different from xattrs which may appear as e.g. PAX metadata, which we don't use
352+
/// at the moment.
353+
///
354+
/// Return whether content was written.
351355
#[context("Writing xattrs")]
352-
fn append_xattrs(&mut self, checksum: &str, xattrs: &glib::Variant) -> Result<bool> {
356+
fn append_ostree_xattrs(&mut self, checksum: &str, xattrs: &glib::Variant) -> Result<bool> {
353357
let xattrs_data = xattrs.data_as_bytes();
354358
let xattrs_data = xattrs_data.as_ref();
355359

@@ -397,7 +401,7 @@ impl<'a, W: std::io::Write> OstreeTarWriter<'a, W> {
397401
// The xattrs objects need to be exported before the regular object they
398402
// refer to. Otherwise the importing logic won't have the xattrs available
399403
// when importing file content.
400-
self.append_xattrs(checksum, &xattrs)?;
404+
self.append_ostree_xattrs(checksum, &xattrs)?;
401405

402406
if let Some(instream) = instream {
403407
ensure!(meta.file_type() == gio::FileType::Regular);

0 commit comments

Comments
 (0)