core: Add --no-xattrs option for commit
Will be used by ostbuild.
This commit is contained in:
1 parent
5c3614d644
commit
5119cbdb7c
4 files changed
+24
-8
No files matched your search
@@ -1452,9 +1452,12 @@ ostree_repo_stage_directory_to_mtree (OstreeRepo *self,
|
||||
|
||||
modified_info = create_modified_file_info (child_info, modifier);
|
||||
|
||||
xattrs = ostree_get_xattrs_for_file (dir, error);
|
||||
if (!xattrs)
|
||||
goto out;
|
||||
if (!(modifier && modifier->skip_xattrs))
|
||||
{
|
||||
xattrs = ostree_get_xattrs_for_file (dir, error);
|
||||
if (!xattrs)
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!stage_directory_meta (self, modified_info, xattrs, &child_file_checksum,
|
||||
cancellable, error))
|
||||
@@ -1513,9 +1516,12 @@ ostree_repo_stage_directory_to_mtree (OstreeRepo *self,
|
||||
goto out;
|
||||
}
|
||||
|
||||
xattrs = ostree_get_xattrs_for_file (child, error);
|
||||
if (!xattrs)
|
||||
goto out;
|
||||
if (!(modifier && modifier->skip_xattrs))
|
||||
{
|
||||
xattrs = ostree_get_xattrs_for_file (child, error);
|
||||
if (!xattrs)
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!stage_object_impl (self, OSTREE_OBJECT_TYPE_RAW_FILE,
|
||||
modified_info, xattrs, file_input, NULL,
|
||||
|
||||
@@ -137,10 +137,14 @@ gboolean ostree_repo_load_variant (OstreeRepo *self,
|
||||
|
||||
typedef struct {
|
||||
volatile gint refcount;
|
||||
gpointer reserved[3];
|
||||
|
||||
gint uid;
|
||||
gint gid;
|
||||
|
||||
guint reserved_flags : 31;
|
||||
guint skip_xattrs : 1;
|
||||
|
||||
gpointer reserved[3];
|
||||
} OstreeRepoCommitModifier;
|
||||
|
||||
OstreeRepoCommitModifier *ostree_repo_commit_modifier_new (void);
|
||||
|
||||
Reference in new issue
Block a user